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 | fcbf164fcbf4110c7e2f96356d6707d56ba44ba4 (patch) | |
| tree | 990a0d029b85047a72b54bcc7846acccd7b6bb9d /t/t3903-stash.sh | |
| parent | 29dba37f1f3d7d692b3994ccda4a5ea705c7f252 (diff) | |
| parent | 9355fc9c35a5c40bbd8e380ec9e36013a1b230ed (diff) | |
| download | git-fcbf164fcbf4110c7e2f96356d6707d56ba44ba4.zip git-fcbf164fcbf4110c7e2f96356d6707d56ba44ba4.tar.gz git-fcbf164fcbf4110c7e2f96356d6707d56ba44ba4.tar.bz2 | |
Merge branch 'jk/maint-stash-oob'
* jk/maint-stash-oob:
stash: fix false positive in the invalid ref test.
stash: fix accidental apply of non-existent stashes
Conflicts:
t/t3903-stash.sh
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 5fcf52a..a27d778 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -37,6 +37,12 @@ test_expect_success 'parents of stash' ' test_cmp output expect ' +test_expect_success 'applying bogus stash does nothing' ' + test_must_fail git stash apply stash@{1} && + echo 1 >expect && + test_cmp expect file +' + test_expect_success 'apply does not need clean working directory' ' echo 4 >other-file && git add other-file && @@ -549,11 +555,11 @@ test_expect_success 'invalid ref of the form stash@{n}, n >= N' ' echo bar6 > file2 && git add file2 && git stash && - test_must_fail git drop stash@{1} && - test_must_fail git pop stash@{1} && - test_must_fail git apply stash@{1} && - test_must_fail git show stash@{1} && - test_must_fail git branch tmp stash@{1} && + test_must_fail git stash drop stash@{1} && + test_must_fail git stash pop stash@{1} && + test_must_fail git stash apply stash@{1} && + test_must_fail git stash show stash@{1} && + test_must_fail git stash branch tmp stash@{1} && git stash drop ' |