mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stash: fix nonsense pipeline

Browse Source 
An earlier change bba067d2 ("stash: don't delete untracked files
that match pathspec", 2018-01-06) was made by taking a suggestion in
a list discussion [1] but did not copy the suggested snippet
correctly.  And the bug was unnoticed during the review and slipped
through.

This fixes it.

[1] https://public-inbox.org/git/xmqqpo7byjwb.fsf@gitster.mtv.corp.google.com/

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2018-03-19 23:21:54 +00:00
parent bba067d2fa
commit d97e4fa748
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-stash.sh
View File

@ -315,9 +315,9 @@ push_stash () {
if test $# != 0 if test $# != 0
then then
git add -u -- "$@" | git add -u -- "$@"
git checkout-index -z --force --stdin git diff-index -p --cached --binary HEAD -- "$@" |
git diff-index -p --cached --binary HEAD -- "$@" | git apply --index -R git apply --index -R
else else
git reset --hard -q git reset --hard -q
fi fi