diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-27 18:36:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-27 18:36:42 (GMT) |
| commit | 65bc83d704b82b613f1f61b4ad97412376ab4a69 (patch) | |
| tree | a1189866640355a5a77a11bc8132f6cee4482139 /t/t3903-stash.sh | |
| parent | 793066e790d25a13abda67ebfad53453087bc31f (diff) | |
| parent | 3a243f7024f21c2c2205cd861f3bb756b0ec43a0 (diff) | |
| download | git-65bc83d704b82b613f1f61b4ad97412376ab4a69.zip git-65bc83d704b82b613f1f61b4ad97412376ab4a69.tar.gz git-65bc83d704b82b613f1f61b4ad97412376ab4a69.tar.bz2 | |
Merge branch 'dm/stash-k-i-p'
* 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
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index a27d778..5c72540 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -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 && |