diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:58:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:58:42 -0700 |
| commit | be44a20aa88b196b769dd894c0ac7a9ff5a7a1f6 (patch) | |
| tree | f624a14245eb53774ec0443b5dbf0f7fd0fd1149 /t | |
| parent | 476e42422d3a62a6aa301e41ba3def6882d37e9e (diff) | |
| parent | 9355fc9c35a5c40bbd8e380ec9e36013a1b230ed (diff) | |
| download | git-be44a20aa88b196b769dd894c0ac7a9ff5a7a1f6.tar.gz git-be44a20aa88b196b769dd894c0ac7a9ff5a7a1f6.tar.xz | |
Merge branch 'jk/maint-stash-oob' into maint
* 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')
| -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 0bd667f04..5c7254064 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 && @@ -557,11 +563,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 ' |