diff options
| author | Dan McGee <dpmcgee@gmail.com> | 2011-04-07 17:04:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-07 22:53:02 (GMT) |
| commit | 21ec98a75d9cecaeb1493462da593343441661b6 (patch) | |
| tree | 3106d49e46a83f8d9c7049eba5d5f0e513c5be81 | |
| parent | fa38cfc2c6ce197960f85798aac18ee78aa83f1f (diff) | |
| download | git-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>
| -rwxr-xr-x | t/t3903-stash.sh | 8 | ||||
| -rwxr-xr-x | t/t3904-stash-patch.sh | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index f62aaf5..bca2df1 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -218,6 +218,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 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 ' |