From e0e7f99ea400808cd11af72425c721c8b44193ca Mon Sep 17 00:00:00 2001 From: Thomas Gummerer Date: Tue, 21 Mar 2017 22:12:19 +0000 Subject: stash: keep untracked files intact in stash -k Currently when there are untracked changes in a file "one" and in a file "two" in the repository and the user uses: git stash push -k one all changes in "two" are wiped out completely. That is clearly not the intended result. Make sure that only the files given in the pathspec are changed when git stash push -k is used. Reported-by: Jeff King Signed-off-by: Thomas Gummerer Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- git-stash.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'git-stash.sh') diff --git a/git-stash.sh b/git-stash.sh index 13711764a9..2fb651b2b8 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -314,7 +314,9 @@ push_stash () { if test "$keep_index" = "t" && test -n "$i_tree" then - git read-tree --reset -u $i_tree + git read-tree --reset $i_tree + git ls-files -z --modified -- "$@" | + git checkout-index -z --force --stdin fi else git apply -R < "$TMP-patch" || -- cgit v1.3