undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t2407: fix broken &&-chains in compound statement

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric Sunshine 2022-08-22 18:26:40 +00:00 committed by Junio C Hamano
parent 795ea8776b
commit 308cbaa082
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t2407-worktree-heads.sh
View File

@ -41,10 +41,10 @@ test_expect_success 'setup' '
test_expect_success 'refuse to overwrite: checked out in worktree' ' test_expect_success 'refuse to overwrite: checked out in worktree' '
for i in 1 2 3 4 for i in 1 2 3 4
do 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 && 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 grep "Cannot delete branch" err || return 1
done done
' '