diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-20 02:21:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-20 19:08:34 +0300 |
| commit | d97e4fa748071635bb7e861ef0c1e7900fcae7c8 (patch) | |
| tree | 5fe55e63876dc5fdda6ae897f78061b60738852e /git-stash.sh | |
| parent | bba067d2faf047597bc76f885fb0cf87894b5ed1 (diff) | |
stash: fix nonsense pipeline
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>
Diffstat (limited to 'git-stash.sh')
| -rwxr-xr-x | git-stash.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-stash.sh b/git-stash.sh index b48b164748..4c92ec931f 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -315,9 +315,9 @@ push_stash () { if test $# != 0 then - git add -u -- "$@" | - git checkout-index -z --force --stdin - git diff-index -p --cached --binary HEAD -- "$@" | git apply --index -R + git add -u -- "$@" + git diff-index -p --cached --binary HEAD -- "$@" | + git apply --index -R else git reset --hard -q fi |