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>
Junio C Hamano committed
Mar 19, 2018 at 23:21 UTC
d97e4fa748071635bb7e861ef0c1e7900fcae7c8
1 file changed
+3
-3
git-stash.sh
+3
-3
@@ -315,9 +315,9 @@ push_stash () {
315
316
if test $# != 0
317
then
318
- git add -u -- "$@" |
319
- git checkout-index -z --force --stdin
320
- git diff-index -p --cached --binary HEAD -- "$@" | git apply --index -R
318
+ git add -u -- "$@"
319
+ git diff-index -p --cached --binary HEAD -- "$@" |
320
+ git apply --index -R
321
else
322
git reset --hard -q
323
fi