Merge branch 'jk/maint-push-over-dav' into maint

[git.git] / t / t3904-stash-patch.sh

diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index d1819ca23a782eddc61d86c62060242b293b86b0..781fd716815d90956575b042d72601e67834231c 100755 (executable)
--- a/t/t3904-stash-patch.sh
+++ b/t/t3904-stash-patch.sh
@@ -20,7 +20,7 @@ test_expect_success PERL 'setup' '
 # note: bar sorts before dir, so the first 'n' is always to skip 'bar'
 
 test_expect_success PERL 'saying "n" does nothing' '
-       set_state dir/foo work index
+       set_state dir/foo work index &&
        (echo n; echo n) | test_must_fail git stash save -p &&
        verify_state dir/foo work index &&
        verify_saved_state bar
@@ -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
 '