diff options
author | Eric Sunshine <sunshine@sunshineco.com> | 2021-12-09 05:11:08 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-12-13 18:29:48 (GMT) |
commit | 7abcbcb7ea4303adffd169d5367ce70904e79bf5 (patch) | |
tree | c200af8c8a1fe797b4d45bb9d0d025b336863046 /t/t5316-pack-delta-depth.sh | |
parent | c576868eaff8cc4c7fb5cf8b787756b16fde268b (diff) | |
download | git-7abcbcb7ea4303adffd169d5367ce70904e79bf5.zip git-7abcbcb7ea4303adffd169d5367ce70904e79bf5.tar.gz git-7abcbcb7ea4303adffd169d5367ce70904e79bf5.tar.bz2 |
tests: fix broken &&-chains in `{...}` groups
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 `{...}` groups 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/t5316-pack-delta-depth.sh')
-rwxr-xr-x | t/t5316-pack-delta-depth.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh index 759169d..df524f7 100755 --- a/t/t5316-pack-delta-depth.sh +++ b/t/t5316-pack-delta-depth.sh @@ -57,8 +57,11 @@ test_expect_success 'create series of packs' ' git commit -m $i && cur=$(git rev-parse HEAD^{tree}) && { - test -n "$prev" && echo "-$prev" - echo $cur + if test -n "$prev" + then + echo "-$prev" + fi && + echo $cur && echo "$(git rev-parse :file) file" } | git pack-objects --stdout >tmp && git index-pack --stdin --fix-thin <tmp || return 1 |