aboutsummaryrefslogtreecommitdiff
path: root/t/t3412-rebase-root.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-10-30 20:46:54 -0500
committerJunio C Hamano <gitster@pobox.com>2010-11-09 11:59:49 -0800
commita48fcd836971d065b9bf16b8cd046fd1aff9b279 (patch)
tree34f868252e96a6cf1f7fe02014977f7fbb12d4c3 /t/t3412-rebase-root.sh
parent00648ba0505bbe1999bb6ae2f1d02a0ef923b191 (diff)
downloadgit-a48fcd836971d065b9bf16b8cd046fd1aff9b279.tar.gz
git-a48fcd836971d065b9bf16b8cd046fd1aff9b279.tar.xz
tests: add missing &&
Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Commands intended to fail should be marked with !, test_must_fail, or test_might_fail. The examples in this patch do not require that. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3412-rebase-root.sh')
-rwxr-xr-xt/t3412-rebase-root.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 5869061c5..086c91c7b 100755
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -173,14 +173,14 @@ EOF
test_expect_success 'pre-rebase hook stops rebase' '
git checkout -b stops1 other &&
test_must_fail git rebase --root --onto master &&
- test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1
+ test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
test 0 = $(git rev-list other...stops1 | wc -l)
'
test_expect_success 'pre-rebase hook stops rebase -i' '
git checkout -b stops2 other &&
test_must_fail git rebase --root --onto master &&
- test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2
+ test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
test 0 = $(git rev-list other...stops2 | wc -l)
'