Skip to content

Commit d97e4fa

Browse files
committed
stash: fix nonsense pipeline
An earlier change bba067d ("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/[email protected]/ Signed-off-by: Junio C Hamano <[email protected]>
1 parent bba067d commit d97e4fa

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

git-stash.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,9 @@ push_stash () {
315315

316316
if test $# != 0
317317
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
321321
else
322322
git reset --hard -q
323323
fi

0 commit comments

Comments
 (0)