diff options
| author |  Jon Seymour <jon.seymour@gmail.com> | 2011-04-06 09:21:13 +1000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-04-05 20:01:52 -0700 |
| commit | 9355fc9c35a5c40bbd8e380ec9e36013a1b230ed (patch) | |
| tree | f17c68144efb5de2ecf88bd720f3da77436ea4ef | |
| parent | stash: fix accidental apply of non-existent stashes (diff) | |
| download | tgif-9355fc9c35a5c40bbd8e380ec9e36013a1b230ed.tar.xz | |
stash: fix false positive in the invalid ref test.
Jeff King reported a problem with git stash apply incorrectly
applying an invalid stash reference.
There is an existing test that should have caught this, but
the test itself was broken, resulting in a false positive.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t3903-stash.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 4f4825770f..3c91f48b20 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -543,11 +543,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 ' |