summaryrefslogtreecommitdiff
path: root/t/t3904-stash-patch.sh
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2011-04-07 12:04:20 -0500
committerJunio C Hamano <gitster@pobox.com>2011-04-07 15:54:04 -0700
commit3a243f7024f21c2c2205cd861f3bb756b0ec43a0 (patch)
treecafd7dd35224d007d7b249c94ca439b61f6a46ae /t/t3904-stash-patch.sh
parent21ec98a75d9cecaeb1493462da593343441661b6 (diff)
downloadgit-3a243f7024f21c2c2205cd861f3bb756b0ec43a0.tar.gz
stash: ensure --no-keep-index and --patch can be used in any order
Don't assume one comes after the other on the command line. Use a three-state variable to track and check its value accordingly. 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.sh2
1 files changed, 1 insertions, 1 deletions
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 &&