Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
stash: fix false positive in the invalid ref test.
author
Jon Seymour
<jon.seymour@gmail.com>
Tue, 5 Apr 2011 23:21:13 +0000
(09:21 +1000)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 6 Apr 2011 03:01:52 +0000
(20:01 -0700)
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>
t/t3903-stash.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
59d418f
)
diff --git
a/t/t3903-stash.sh
b/t/t3903-stash.sh
index 4f4825770f179939f9676ea970bc86c4da0ab0e0..3c91f48b204764804fbf6d1cef1133d3fe518b87 100755
(executable)
--- 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 &&
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 s
tash s
how stash@{1} &&
+ test_must_fail git
stash
branch tmp stash@{1} &&
git stash drop
'
git stash drop
'