summaryrefslogtreecommitdiff
path: root/trace2/tr2_tls.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2022-03-07 13:48:58 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-07 13:27:40 -0800
commit8127a2b1f51658f4e3fad1d70bef9ce7a0d030ed (patch)
tree27700372a45fc80d02ee1035e103310c0d746fb5 /trace2/tr2_tls.c
parentapply tests: use "test_must_fail" instead of ad-hoc pattern (diff)
downloadtgif-8127a2b1f51658f4e3fad1d70bef9ce7a0d030ed.tar.xz
merge tests: use "test_must_fail" instead of ad-hoc pattern
As in the preceding commit change a similar fragile test pattern introduced in b798671fa93 (merge-recursive: do not rudely die on binary merge, 2007-08-14) to use a "test_must_fail" instead. Before this we wouldn't distinguish normal "git merge" failures from segfaults or abort(). Unlike the preceding commit we didn't end up hiding any SANITIZE=leak failures in this case, but let's correspondingly change these anyway. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trace2/tr2_tls.c')
0 files changed, 0 insertions, 0 deletions