summaryrefslogtreecommitdiffstats
path: root/t/t4123-apply-shrink.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-01-04 01:24:15 +0100
committerJunio C Hamano <gitster@pobox.com>2022-01-04 01:24:15 +0100
commit4f4b18497aea75425506097de7225df8c7cf5c66 (patch)
tree894010237b6188081699ace29bf5796f42bd4362 /t/t4123-apply-shrink.sh
parentMerge branch 'ns/tmp-objdir' (diff)
parentt6000-t9999: detect and signal failure within loop (diff)
downloadgit-4f4b18497aea75425506097de7225df8c7cf5c66.tar.xz
git-4f4b18497aea75425506097de7225df8c7cf5c66.zip
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/t4123-apply-shrink.sh')
-rwxr-xr-xt/t4123-apply-shrink.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4123-apply-shrink.sh b/t/t4123-apply-shrink.sh
index ef57cd3aeb..dfa053ff28 100755
--- a/t/t4123-apply-shrink.sh
+++ b/t/t4123-apply-shrink.sh
@@ -47,8 +47,8 @@ test_expect_success 'apply should fail gracefully' '
echo Oops, should not have succeeded
false
else
- status=$?
- echo "Status was $status"
+ status=$? &&
+ echo "Status was $status" &&
if test -f .git/index.lock
then
echo Oops, should not have crashed