diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-01-03 16:24:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-03 16:24:15 -0800 |
| commit | 4f4b18497aea75425506097de7225df8c7cf5c66 (patch) | |
| tree | 894010237b6188081699ace29bf5796f42bd4362 /t/t6407-merge-binary.sh | |
| parent | Merge branch 'ns/tmp-objdir' (diff) | |
| parent | t6000-t9999: detect and signal failure within loop (diff) | |
| download | tgif-4f4b18497aea75425506097de7225df8c7cf5c66.tar.xz | |
Merge branch 'es/test-chain-lint'
Broken &&-chains in the test scripts have been corrected.
* es/test-chain-lint:
t6000-t9999: detect and signal failure within loop
t5000-t5999: detect and signal failure within loop
t4000-t4999: detect and signal failure within loop
t0000-t3999: detect and signal failure within loop
tests: simplify by dropping unnecessary `for` loops
tests: apply modern idiom for exiting loop upon failure
tests: apply modern idiom for signaling test failure
tests: fix broken &&-chains in `{...}` groups
tests: fix broken &&-chains in `$(...)` command substitutions
tests: fix broken &&-chains in compound statements
tests: use test_write_lines() to generate line-oriented output
tests: simplify construction of large blocks of text
t9107: use shell parameter expansion to avoid breaking &&-chain
t6300: make `%(raw:size) --shell` test more robust
t5516: drop unnecessary subshell and command invocation
t4202: clarify intent by creating expected content less cleverly
t1020: avoid aborting entire test script when one test fails
t1010: fix unnoticed failure on Windows
t/lib-pager: use sane_unset() to avoid breaking &&-chain
Diffstat (limited to 't/t6407-merge-binary.sh')
| -rwxr-xr-x | t/t6407-merge-binary.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6407-merge-binary.sh b/t/t6407-merge-binary.sh index e34676c204..8e6241f92e 100755 --- a/t/t6407-merge-binary.sh +++ b/t/t6407-merge-binary.sh @@ -48,7 +48,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 ' @@ -63,7 +63,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 ' |