Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-15 Thread Jacob Keller
On Fri, Sep 15, 2017 at 10:21 AM, Kevin Willford wrote: > From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Thursday, September 14, 2017 11:00 PM >> >> Kevin Willford writes: >> >> > 1. Does this statement, "I only care about the files in this >> > sparse checkout, and do not concern me wit

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-15 Thread Kevin Willford
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Thursday, September 14, 2017 11:00 PM > > Kevin Willford writes: > > > 1. Does this statement, "I only care about the files in this > > sparse checkout, and do not concern me with anything else", mean > > that git should not change files outs

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-14 Thread Junio C Hamano
Kevin Willford writes: > 1. Does this statement, "I only care about the files in this > sparse checkout, and do not concern me with anything else", mean > that git should not change files outside the sparse-checkout whether > that be in the working directory or in the index? Or does that only >

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-14 Thread Kevin Willford
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Wednesday, September 13, 2017 4:18 PM > > Jacob Keller writes: > > > By definition if you do a sparse checkout, you're telling git "I only > > care about the files in this sparse checkout, and do not concern me > > with anything else"...

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-13 Thread Junio C Hamano
Jacob Keller writes: > By definition if you do a sparse checkout, you're telling git "I only > care about the files in this sparse checkout, and do not concern me > with anything else"... So the proposed fix is "since git cleared the > skip-worktree flag, we should actually also copy the file out

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-13 Thread Kevin Willford
> From: Jacob Keller [mailto:jacob.kel...@gmail.com] > Sent: Tuesday, September 12, 2017 7:39 PM > > On Tue, Sep 12, 2017 at 4:30 PM, Kevin Willford wrote: > > > > Sorry. It was not in the sparse-checkout file. > > $ git config core.sparsecheckout true > > $ echo /i > .git/info/sparse-checkout >

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-12 Thread Jacob Keller
On Tue, Sep 12, 2017 at 4:30 PM, Kevin Willford wrote: > > Sorry. It was not in the sparse-checkout file. > $ git config core.sparsecheckout true > $ echo /i > .git/info/sparse-checkout > $ git checkout -f > was ran in the modified file case as well and "i" was the only file in the > working dire

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-12 Thread Kevin Willford
> From: Jacob Keller [mailto:jacob.kel...@gmail.com] > Sent: Tuesday, September 12, 2017 4:29 PM > > On Tue, Sep 12, 2017 at 1:20 PM, Kevin Willford wrote: > > > > I think this is where I need to do a better job of explaining so here is a > > simple example. > > > > I have a file "a" that was add

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-12 Thread Jacob Keller
On Tue, Sep 12, 2017 at 1:20 PM, Kevin Willford wrote: >> From: Junio C Hamano [mailto:gits...@pobox.com] >> Sent: Monday, September 11, 2017 9:57 PM >> >> Let's imagine a path P that is outside the sparse checkout area. >> And we check out a commit that has P. P would still be recorded in >> the

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-12 Thread Kevin Willford
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Monday, September 11, 2017 9:57 PM > > Let's imagine a path P that is outside the sparse checkout area. > And we check out a commit that has P. P would still be recorded in > the index but it would not materialize in the working tree. "gi

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-11 Thread Junio C Hamano
Johannes Schindelin writes: >> Stepping back a bit, I am not sure if it is sane or even valid for the >> end-user to modify paths outside sparse-checkout area, but that is >> probably a separate tangent. > > That is not at all the scenario that Kevin fixed. I know, but in this tangent I was reac

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-11 Thread Johannes Schindelin
Hi Junio, On Mon, 11 Sep 2017, Junio C Hamano wrote: > Stepping back a bit, I am not sure if it is sane or even valid for the > end-user to modify paths outside sparse-checkout area, but that is > probably a separate tangent. That is not at all the scenario that Kevin fixed. Just have a quick lo

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-10 Thread Junio C Hamano
Kevin Willford writes: > I agree with this when you are not dealing with a sparse-checkout. > When using a sparse-checkout I expect git not to touch things > outside of what I have specified in my sparse-checkout file. If it > does, it should let me know or put my working directory in a > state

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-08 Thread Kevin Willford
> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Friday, September 8, 2017 9:18 PM > > Kevin Willford writes: > > > 1. reset mixed when there were files that were added > > > > In this case the index will no longer have the entry at all because > > the reset is making the index look lik

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-08 Thread Junio C Hamano
Kevin Willford writes: > 1. reset mixed when there were files that were added > > In this case the index will no longer have the entry at all because > the reset is making the index look like before the file was added > which didn't have it. When not using the sparse-checkout this is fine > becau

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-08 Thread Kevin Willford
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Friday, September 8, 2017 1:02 PM > Kevin Willford writes: > > > diff --git a/builtin/reset.c b/builtin/reset.c > > index d72c7d1c96..1b8bb45989 100644 > > --- a/builtin/reset.c > > +++ b/builtin/reset.c > > @@ -24,6 +24,7 @@ > > #include "ca

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-08 Thread Kevin Willford
From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Friday, September 8, 2017 1:12 PM > Kevin Willford writes: > > > When using the sparse checkout feature the git reset command will add > > entries to the index that will have the skip-worktree bit off but will > > leave the working directory

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-08 Thread Junio C Hamano
Kevin Willford writes: > When using the sparse checkout feature the git reset command will add > entries to the index that will have the skip-worktree bit off but will > leave the working directory empty. File data is lost because the index > version of the files have been changed but there is n

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-08 Thread Junio C Hamano
Torsten Bögershausen writes: >> +test_expect_success 'setup' ' >> +test_tick && > > Do we need a test_tick here ? As the test does not check against exact object names, and it does not create commits, the order among which needs to be tiebroken by using the committer timestamp, it is not str

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-08 Thread Junio C Hamano
Kevin Willford writes: > diff --git a/builtin/reset.c b/builtin/reset.c > index d72c7d1c96..1b8bb45989 100644 > --- a/builtin/reset.c > +++ b/builtin/reset.c > @@ -24,6 +24,7 @@ > #include "cache-tree.h" > #include "submodule.h" > #include "submodule-config.h" > +#include "dir.h" > > static

Re: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-08 Thread Torsten Bögershausen
On Fri, Sep 08, 2017 at 12:00:50PM -0600, Kevin Willford wrote: > When using the sparse checkout feature the git reset command will add > entries to the index that will have the skip-worktree bit off but will > leave the working directory empty. File data is lost because the index > version of the

[PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

2017-09-08 Thread Kevin Willford
When using the sparse checkout feature the git reset command will add entries to the index that will have the skip-worktree bit off but will leave the working directory empty. File data is lost because the index version of the files have been changed but there is nothing that is in the working dir