From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Jan 2022 00:24:15 +0000 (-0800)
Subject: Merge branch 'es/test-chain-lint'
X-Git-Tag: v2.35.0-rc0~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f4b18497aea75425506097de7225df8c7cf5c66;p=thirdparty%2Fgit.git

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
---

4f4b18497aea75425506097de7225df8c7cf5c66
diff --cc t/t4126-apply-empty.sh
index 82284d2f45,7391a5a1d2..33860d3829
--- a/t/t4126-apply-empty.sh
+++ b/t/t4126-apply-empty.sh
@@@ -11,12 -9,7 +11,9 @@@ test_expect_success setup 
  	git add empty &&
  	test_tick &&
  	git commit -m initial &&
 +	git commit --allow-empty -m "empty commit" &&
 +	git format-patch --always HEAD~ >empty.patch &&
- 	for i in a b c d e
- 	do
- 		echo $i
- 	done >empty &&
+ 	test_write_lines a b c d e >empty &&
  	cat empty >expect &&
  	git diff |
  	sed -e "/^diff --git/d" \