[PATCH 1/3] t2407: fix broken &&-chains in compound statement
- From
Eric Sunshine via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Aug 22, 2022, 18:26 UTC
- Message-ID
- <15d7520479f412d13de17c323311aba077043bf8.1661192802.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.1312.git.git.1661192802.gitgitgadget@gmail.com>
From: Eric Sunshine <sunshine@sunshineco.com>
The breaks in the &&-chain in this test went unnoticed because the "magic exit code 117" &&-chain checker built into test-lib.sh only recognizes broken &&-chains at the top-level; it does not work within `{...}` groups, `(...)` subshells, `$(...)` substitutions, or within bodies of compound statements, such as `if`, `for`, `while`, `case`, etc. Furthermore, `chainlint.sed` detects broken &&-chains only in `(...)` subshells. Thus, the &&-chain breaks in this test fall into the blind spots of the &&-chain linters.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> --- t/t2407-worktree-heads.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t2407-worktree-heads.sh b/t/t2407-worktree-heads.sh index 50815acd3e8..019a40df2ca 100755 --- a/t/t2407-worktree-heads.sh +++ b/t/t2407-worktree-heads.sh @@ -41,10 +41,10 @@ test_expect_success 'setup' ' test_expect_success 'refuse to overwrite: checked out in worktree' ' for i in 1 2 3 4 do - test_must_fail git branch -f wt-$i HEAD 2>err + test_must_fail git branch -f wt-$i HEAD 2>err && grep "cannot force update the branch" err && - test_must_fail git branch -D wt-$i 2>err + test_must_fail git branch -D wt-$i 2>err && grep "Cannot delete branch" err || return 1 done '
-- gitgitgadget