diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:57:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:57:49 -0700 |
| commit | e9f1878da7be816042c915cdf0542f9325c36209 (patch) | |
| tree | 5acea99febe456515699d1d7cd6176be3a0d5b13 | |
| parent | f28d2e33c64819d0425c426cd2c4511634096a40 (diff) | |
| parent | 3a243f7024f21c2c2205cd861f3bb756b0ec43a0 (diff) | |
| download | git-e9f1878da7be816042c915cdf0542f9325c36209.tar.gz | |
Merge branch 'dm/stash-k-i-p' into maint
* dm/stash-k-i-p:
stash: ensure --no-keep-index and --patch can be used in any order
stash: add two more tests for --no-keep-index
| -rwxr-xr-x | git-stash.sh | 9 | ||||
| -rwxr-xr-x | t/t3903-stash.sh | 8 | ||||
| -rwxr-xr-x | t/t3904-stash-patch.sh | 12 |
3 files changed, 25 insertions, 4 deletions
diff --git a/git-stash.sh b/git-stash.sh index fbd4bc152d..81a59a250e 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/t3903-stash.sh b/t/t3903-stash.sh index 5fcf52a071..0bd667f04b 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -230,6 +230,14 @@ test_expect_success 'stash -k' ' test bar,bar4 = $(cat file),$(cat file2) ' +test_expect_success 'stash --no-keep-index' ' + echo bar33 > file && + echo bar44 > file2 && + git add file2 && + git stash --no-keep-index && + test bar,bar2 = $(cat file),$(cat file2) +' + test_expect_success 'stash --invalid-option' ' echo bar5 > file && echo bar6 > file2 && diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh index 1e7193ac0b..781fd71681 100755 --- a/t/t3904-stash-patch.sh +++ b/t/t3904-stash-patch.sh @@ -48,6 +48,18 @@ test_expect_success PERL 'git stash -p --no-keep-index' ' verify_state bar dummy bar_index ' +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 && + verify_state dir/foo head head && + verify_state bar bar_work dummy && + git reset --hard && + git stash apply --index && + verify_state dir/foo work index && + verify_state bar dummy bar_index +' + test_expect_success PERL 'none of this moved HEAD' ' verify_saved_head ' |