summaryrefslogtreecommitdiff
path: root/t/t6036-recursive-corner-cases.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-03-20 06:09:22 -0400
committerJunio C Hamano <gitster@pobox.com>2015-03-20 10:20:15 -0700
commit0a5e3c50de60c73782f1add9eb8d1e8dc8eabcb8 (patch)
tree9f94c217fd91f07949de921a9b05d498e3d4291d /t/t6036-recursive-corner-cases.sh
parenta167ece0c8cd9470427f8e9a1b43b27303eefa75 (diff)
downloadgit-0a5e3c50de60c73782f1add9eb8d1e8dc8eabcb8.tar.gz
t: use test_must_fail instead of hand-rolled blocks
These test scripts likely predate test_must_fail, and can be made simpler by using it (in addition to making them pass --chain-lint). The case in t6036 loses some verbosity in the failure case, but it is so tied to a specific failure mode that it is not worth keeping around (and the outcome of the test is not affected at all). 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-xt/t6036-recursive-corner-cases.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
index 8923b04e60..9d6621c056 100755
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6036-recursive-corner-cases.sh
@@ -195,12 +195,7 @@ test_expect_success 'git detects differently handled merges conflict' '
git reset --hard &&
git checkout D^0 &&
- git merge -s recursive E^0 && {
- echo "BAD: should have conflicted"
- test "Incorrectly merged content" = "$(cat new_a)" &&
- echo "BAD: Silently accepted wrong content"
- return 1
- }
+ test_must_fail git merge -s recursive E^0 &&
test 3 = $(git ls-files -s | wc -l) &&
test 3 = $(git ls-files -u | wc -l) &&