summaryrefslogtreecommitdiff
path: root/t/t6407-merge-binary.sh
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2021-12-09 05:11:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-12-13 18:29:48 (GMT)
commit74d2f5695dab4454097b2d1693f7206e8328724a (patch)
tree6d4a147a909ef45477fd1509e83530b7ed39bec9 /t/t6407-merge-binary.sh
parent0849541268a3aca9381591aed87b6864a203709b (diff)
downloadgit-74d2f5695dab4454097b2d1693f7206e8328724a.zip
git-74d2f5695dab4454097b2d1693f7206e8328724a.tar.gz
git-74d2f5695dab4454097b2d1693f7206e8328724a.tar.bz2
tests: fix broken &&-chains in compound statements
The top-level &&-chain checker built into t/test-lib.sh causes tests to magically exit with code 117 if the &&-chain is broken. However, it has the shortcoming that the magic does not work within `{...}` groups, `(...)` subshells, `$(...)` substitutions, or within bodies of compound statements, such as `if`, `for`, `while`, `case`, etc. `chainlint.sed` partly fills in the gap by catching broken &&-chains in `(...)` subshells, but bugs can still lurk behind broken &&-chains in the other cases. Fix broken &&-chains in compound statements in order to reduce the number of possible lurking bugs. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6407-merge-binary.sh')
-rwxr-xr-xt/t6407-merge-binary.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6407-merge-binary.sh b/t/t6407-merge-binary.sh
index d4273f2..4c4f690 100755
--- a/t/t6407-merge-binary.sh
+++ b/t/t6407-merge-binary.sh
@@ -47,7 +47,7 @@ test_expect_success resolve '
echo Oops, should not have succeeded
false
else
- git ls-files -s >current
+ git ls-files -s >current &&
test_cmp expect current
fi
'
@@ -62,7 +62,7 @@ test_expect_success recursive '
echo Oops, should not have succeeded
false
else
- git ls-files -s >current
+ git ls-files -s >current &&
test_cmp expect current
fi
'