summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b0c6bf4)
raw | patch | inline | side by side (parent: b0c6bf4)
author | Jon Seymour <jon.seymour@gmail.com> | |
Tue, 31 Aug 2010 14:49:20 +0000 (00:49 +1000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 31 Aug 2010 16:50:07 +0000 (09:50 -0700) |
Some tests in detached-stash are calling test_must_fail
in such a way that the arguments to test_must_fail do, indeed, fail
but not in the manner expected by the test.
This patch removes the unnecessary and unhelpful double quotes.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
in such a way that the arguments to test_must_fail do, indeed, fail
but not in the manner expected by the test.
This patch removes the unnecessary and unhelpful double quotes.
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 |
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index ea9f97997e48362bb9cca8ccf496d4ef6ce9a54b..d99f27a12f40d73094ef286a067f3c6771e61865 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -435,7 +435,7 @@ test_expect_success 'stash drop - fail early if specified stash is not a stash r
git stash &&
echo bar > file &&
git stash &&
- test_must_fail "git stash drop $(git rev-parse stash@{0})" &&
+ test_must_fail git stash drop $(git rev-parse stash@{0}) &&
git stash pop &&
test bar = "$(cat file)" &&
git reset --hard HEAD
@@ -449,7 +449,7 @@ test_expect_success 'stash pop - fail early if specified stash is not a stash re
git stash &&
echo bar > file &&
git stash &&
- test_must_fail "git stash pop $(git rev-parse stash@{0})" &&
+ test_must_fail git stash pop $(git rev-parse stash@{0}) &&
git stash pop &&
test bar = "$(cat file)" &&
git reset --hard HEAD
git add file2 &&
git stash &&
! "git rev-parse --quiet --verify does-not-exist" &&
- test_must_fail "git stash drop does-not-exist" &&
- test_must_fail "git stash drop does-not-exist@{0}" &&
- test_must_fail "git stash pop does-not-exist" &&
- test_must_fail "git stash pop does-not-exist@{0}" &&
- test_must_fail "git stash apply does-not-exist" &&
- test_must_fail "git stash apply does-not-exist@{0}" &&
- test_must_fail "git stash show does-not-exist" &&
- test_must_fail "git stash show does-not-exist@{0}" &&
- test_must_fail "git stash branch tmp does-not-exist" &&
- test_must_fail "git stash branch tmp does-not-exist@{0}" &&
+ test_must_fail git stash drop does-not-exist &&
+ test_must_fail git stash drop does-not-exist@{0} &&
+ test_must_fail git stash pop does-not-exist &&
+ test_must_fail git stash pop does-not-exist@{0} &&
+ test_must_fail git stash apply does-not-exist &&
+ test_must_fail git stash apply does-not-exist@{0} &&
+ test_must_fail git stash show does-not-exist &&
+ test_must_fail git stash show does-not-exist@{0} &&
+ test_must_fail git stash branch tmp does-not-exist &&
+ test_must_fail git stash branch tmp does-not-exist@{0} &&
git stash drop
'
test_expect_success 'invalid ref of the form stash@{n}, n >= N' '
git stash clear &&
- test_must_fail "git stash drop stash@{0}" &&
+ test_must_fail git stash drop stash@{0} &&
echo bar5 > file &&
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 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} &&
git stash drop
'