diff options
| author | Jeff King <peff@peff.net> | 2015-03-20 10:06:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 17:20:13 (GMT) |
| commit | 8fb268720e8565885039e7491f4628974e2d66a2 (patch) | |
| tree | 62e1615b5e6ce8f08238bff5b947f646e377e706 /t/t6036-recursive-corner-cases.sh | |
| parent | bb79af9d09709d6d93a01d1494d0ca93ff6d4b99 (diff) | |
| download | git-8fb268720e8565885039e7491f4628974e2d66a2.zip git-8fb268720e8565885039e7491f4628974e2d66a2.tar.gz git-8fb268720e8565885039e7491f4628974e2d66a2.tar.bz2 | |
t: fix severe &&-chain breakage
These are tests which are missing a link in their &&-chain,
in a location which causes a significant portion of the test
to be missed (e.g., the test effectively does nothing, or
consists of a long string of actions and output comparisons,
and we throw away the exit code of at least one part of the
string).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6036-recursive-corner-cases.sh')
| -rwxr-xr-x | t/t6036-recursive-corner-cases.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index a86087b..b43d031 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -533,7 +533,7 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' ' test $(git rev-parse :3:a) = $(git rev-parse B:a) && test $(git rev-parse :2:a/file) = $(git rev-parse E2:a/file) && - test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) + test $(git rev-parse :1:a/file) = $(git rev-parse C:a/file) && test $(git rev-parse :0:ignore-me) = $(git rev-parse A:ignore-me) && test -f a~D^0 |