diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-01-04 00:24:15 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-04 00:24:15 (GMT) |
commit | 4f4b18497aea75425506097de7225df8c7cf5c66 (patch) | |
tree | 894010237b6188081699ace29bf5796f42bd4362 /t/t2201-add-update-typechange.sh | |
parent | 0dc90d954db852c6604796b8d817365f94e92a16 (diff) | |
parent | 0c51d6b4aec9f1959d148960cb55155b676cec78 (diff) | |
download | git-4f4b18497aea75425506097de7225df8c7cf5c66.zip git-4f4b18497aea75425506097de7225df8c7cf5c66.tar.gz git-4f4b18497aea75425506097de7225df8c7cf5c66.tar.bz2 |
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/t2201-add-update-typechange.sh')
-rwxr-xr-x | t/t2201-add-update-typechange.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t2201-add-update-typechange.sh b/t/t2201-add-update-typechange.sh index c6876b1..dba62d6 100755 --- a/t/t2201-add-update-typechange.sh +++ b/t/t2201-add-update-typechange.sh @@ -98,17 +98,17 @@ test_expect_success modify ' " } >expect && { - cat expect - echo ":100644 160000 $_empty $ZERO_OID T yonk" + cat expect && + echo ":100644 160000 $_empty $ZERO_OID T yonk" && echo ":100644 000000 $_empty $ZERO_OID D zifmia" } >expect-files && { - cat expect + cat expect && echo ":000000 160000 $ZERO_OID $ZERO_OID A yonk" } >expect-index && { - echo "100644 $_empty 0 nitfol" - echo "160000 $yomin 0 yomin" + echo "100644 $_empty 0 nitfol" && + echo "160000 $yomin 0 yomin" && echo "160000 $yonk 0 yonk" } >expect-final ' |