Merge branch 'dm/stash-k-i-p'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:42 +0000 (11:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Apr 2011 18:36:42 +0000 (11:36 -0700)
* 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

git-stash.sh
t/t3903-stash.sh
t/t3904-stash-patch.sh
index 07ac3235904d7f0ac6c2e79af8b35f84c8f0874c..0a9403653d7dbbb6927973dcfcc41bfd9a904e05 100755 (executable)
@@ -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
index a27d778624c1fe8ca39038f5913eb34a822b23a3..5c725406422dcedb6c6d5e5d61cfc80f87d3595c 100755 (executable)
@@ -236,6 +236,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 &&
index 1e7193ac0bc650868f187d3103be32c3004a95b2..781fd716815d90956575b042d72601e67834231c 100755 (executable)
@@ -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
 '