On 12/16, Junio C Hamano wrote:
> Thomas Gummerer <t.gummerer@xxxxxxxxx> writes:
>
> > Maybe the best solution would be to introduce 'git reset --hard --
> > <pathspec>', or maybe someone who knows shell programming a little
> > better than me has an idea?
> >
> > diff --git a/git-stash.sh b/git-stash.sh
> > index 1114005ce2..01bf74015e 100755
> > --- a/git-stash.sh
> > +++ b/git-stash.sh
> > @@ -322,10 +322,15 @@ push_stash () {
> >
> > if test $# != 0
> > then
> > + git ls-files -z >"$(git rev-parse --git-dir)"/stash-to-remove
> > git reset -q -- "$@"
> > git ls-files -z --modified -- "$@" |
> > git checkout-index -z --force --stdin
> > - git clean --force -q -d -- "$@"
> > + while read -r -d '' to_delete
> > + do
> > + git clean --force -q -d -- "$to_delete"
> > + done <"$(git rev-parse --git-dir)"/stash-to-remove
> > + rm "$(git rev-parse --git-dir)"/stash-to-remove
> > else
> > git reset --hard -q
> > fi
>
> Hmph. I personally did not care (nor use) pathspec limited stash
> creation, so I admit that I do not offhand know what this code
> (before or after the above fix) is trying to do, even though it has
> been in our tree for some time X-<.
Yeah unfortunately this has been broken for pathspecs that match
untracked files since I introduced it :(
> But judging from the fact that
> the other side is a mere "git reset --hard" (for the whole tree), I
> guess for each and every path in the index and/or in the HEAD that
> match pathspec "$@", you are trying to
>
> - remove it from the index if it is not in HEAD;
>
> - add it to the index if it is not in the index but is in HEAD; or
>
> - reset the index to the version in HEAD if it is in the index.
>
> and then match the working tree version to that of the index?
That's correct. That's how I would have imagined 'git reset --hard --
<pathspec>'.
> I am not convinced that "git reset --hard -- <pathspec>" is a good
> UI [*1*] but I agree that a low level facility that does these would
> be quite helpful to implement the then-clause of the above.
Thanks a lot for spelling this out below. After reading that I
definitely agree that 'git reset --hard -- <pathspec>' wouldn't be a
good UI, and something like that would belong in checkout.
> But I suspect that you do not have to do shell "logic" nor low-level
> plumbing update in this case. Would the attached work?
Ah interesting, what you have below looks good to me indeed, it
matches what I'd expect it to do and fixes the bug that was reported.
Thanks!
I've taken the liberty to take what you have below and turned into a
proper patch, giving you authorship of it, as you wrote the code for
the fix. Hope that's the appropriate credit for you for this patch.
[...]
--- >8 ---
From: Junio C Hamano <gitster@xxxxxxxxx>
Subject: [PATCH] stash: don't delete untracked files that match pathspec
Currently when 'git stash push -- <pathspec>' is used, untracked files
that match the pathspec will be deleted, even though they do not end up
in a stash anywhere.
Untracked files should be left along by 'git stash push -- <pathspec>'
unless the --untracked or --all flags are given. Fix that.
Reported-by: Reid Price <reid.price@xxxxxxxxx>
Test-by: Thomas Gummerer <t.gummerer@xxxxxxxxx>
Signed-off-by: Thomas Gummerer <t.gummerer@xxxxxxxxx>
---
git-stash.sh | 5 ++---
t/t3903-stash.sh | 16 ++++++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index 1114005ce2..a979bfb665 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -322,10 +322,9 @@ push_stash () {
if test $# != 0
then
- git reset -q -- "$@"
- git ls-files -z --modified -- "$@" |
+ git ls-files -z -- "$@" |
git checkout-index -z --force --stdin
- git clean --force -q -d -- "$@"
+ git diff-index -p HEAD -- "$@" | git apply --index -R
else
git reset --hard -q
fi
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 39c7f2ebd7..6952a031b2 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1064,4 +1064,20 @@ test_expect_success 'stash -k -- <pathspec> leaves unstaged files intact' '
test foo,bar = $(cat foo),$(cat bar)
'
+test_expect_success 'stash -- <subdir> leaves untracked files in subdir intact' '
+ git reset &&
+ >subdir/untracked &&
+ >subdir/tracked1 &&
+ >subdir/tracked2 &&
+ git add subdir/tracked* &&
+ git stash -- subdir/ &&
+ test_path_is_missing subdir/tracked1 &&
+ test_path_is_missing subdir/tracked2 &&
+ test_path_is_file subdir/untracked &&
+ git stash pop &&
+ test_path_is_file subdir/tracked1 &&
+ test_path_is_file subdir/tracked2 &&
+ test_path_is_file subdir/untracked
+'
+
test_done
--
2.15.1.390.ga48b24a585.dirty
