undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stash: pass the pathspec argument to git reset

Browse Source 
For "git stash -p --no-keep-index", the pathspec argument is currently
not passed to "git reset".  This means that changes that are staged but
that are excluded from the pathspec still get unstaged by git stash -p.

Make sure that doesn't happen by passing the pathspec argument to the
git reset in question, bringing the behaviour in line with "git stash --
<pathspec>".

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Thomas Gummerer 2017-03-21 22:12:18 +00:00 committed by Junio C Hamano
parent 1790f4fea0
commit 869fb8f729
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-stash.sh
View File

@ -322,7 +322,7 @@ push_stash () {
if test "$keep_index" != "t" if test "$keep_index" != "t"
then then
git reset -q git reset -q -- "$@"
fi fi
fi fi
} }

8
t/t3904-stash-patch.sh
View File

@ -77,6 +77,14 @@ test_expect_success 'git stash --no-keep-index -p' '
verify_state dir/foo work index verify_state dir/foo work index
' '
test_expect_success 'stash -p --no-keep-index -- <pathspec> does not unstage other files' '
set_state HEAD HEADfile_work HEADfile_index &&
set_state dir/foo work index &&
echo y | git stash push -p --no-keep-index -- HEAD &&
verify_state HEAD committed committed &&
verify_state dir/foo work index
'
test_expect_success 'none of this moved HEAD' ' test_expect_success 'none of this moved HEAD' '
verify_saved_head verify_saved_head
' '