diff options
| -rwxr-xr-x | git-stash.sh | 9 | ||||
| -rwxr-xr-x | t/t3904-stash-patch.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/git-stash.sh b/git-stash.sh index a305fb19f1..fd66884090 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -136,11 +136,12 @@ save_stash () { keep_index=t ;; --no-keep-index) - keep_index= + keep_index=n ;; -p|--patch) patch_mode=t - keep_index=t + # only default to keep if we don't already have an override + test -z "$keep_index" && keep_index=t ;; -q|--quiet) GIT_QUIET=t @@ -185,7 +186,7 @@ save_stash () { then git reset --hard ${GIT_QUIET:+-q} - if test -n "$keep_index" && test -n $i_tree + if test "$keep_index" = "t" && test -n $i_tree then git read-tree --reset -u $i_tree fi @@ -193,7 +194,7 @@ save_stash () { git apply -R < "$TMP-patch" || die "Cannot remove worktree changes" - if test -z "$keep_index" + if test "$keep_index" != "t" then git reset fi diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh index 4d5878950b..781fd71681 100755 --- a/t/t3904-stash-patch.sh +++ b/t/t3904-stash-patch.sh @@ -48,7 +48,7 @@ test_expect_success PERL 'git stash -p --no-keep-index' ' verify_state bar dummy bar_index ' -test_expect_failure PERL 'git stash --no-keep-index -p' ' +test_expect_success PERL 'git stash --no-keep-index -p' ' set_state dir/foo work index && set_state bar bar_work bar_index && (echo n; echo y) | git stash save --no-keep-index -p && |