summaryrefslogtreecommitdiff
path: root/t/t3904-stash-patch.sh
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2011-04-07 17:04:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-07 22:53:02 (GMT)
commit21ec98a75d9cecaeb1493462da593343441661b6 (patch)
tree3106d49e46a83f8d9c7049eba5d5f0e513c5be81 /t/t3904-stash-patch.sh
parentfa38cfc2c6ce197960f85798aac18ee78aa83f1f (diff)
downloadgit-21ec98a75d9cecaeb1493462da593343441661b6.zip
git-21ec98a75d9cecaeb1493462da593343441661b6.tar.gz
git-21ec98a75d9cecaeb1493462da593343441661b6.tar.bz2
stash: add two more tests for --no-keep-index
One of these passes just fine; the other one exposes a problem where command line flag order matters for --no-keep-index and --patch interaction. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3904-stash-patch.sh')
-rwxr-xr-xt/t3904-stash-patch.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index 1e7193a..4d58789 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_failure 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
'