[PATCH 1/3] Update t4001 to use modern syntax.
COLD25d
From: "Mark C. Chu-Carroll via B4 Relay" <devnull+markchucarroll.fastmail.com@kernel.org>
Date: 2026-09-08 19:45:02
Also in:
b4-sent
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v1 of 3 in this series.
Revisions (3)
- v1 current
- v2 [diff vs current]
- v3 [diff vs current]
From: "Mark C. Chu-Carroll" <redacted> --- t/t4001-diff-rename.sh | 31 ++++++++++++++++--------------- t/t4009-diff-rename-4.sh | 8 ++++---- 2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index ad474100af..2aa161c217 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh@@ -88,28 +88,29 @@ test_expect_success 'setup' ' EOF ' -test_expect_success \ - 'update-index --add a file.' \ - 'git update-index --add path0' +test_expect_success 'update-index --add a file.' ' + git update-index --add path0 +' -test_expect_success \ - 'write that tree.' \ - 'tree=$(git write-tree) && echo $tree' +test_expect_success 'write that tree.' ' + tree=$(git write-tree) && echo $tree +' sed -e 's/line/Line/' <path0 >path1 rm -f path0 -test_expect_success \ - 'renamed and edited the file.' \ - 'git update-index --add --remove path0 path1' -test_expect_success \ - 'git diff-index -p -M after rename and editing.' \ - 'git diff-index -p -M $tree >current' +test_expect_success 'renamed and edited the file.' ' + git update-index --add --remove path0 path1 +' + +test_expect_success 'git diff-index -p -M after rename and editing.' ' + git diff-index -p -M $tree >current +' -test_expect_success \ - 'validate the output.' \ - 'compare_diff_patch current expected' +test_expect_success 'validate the output.' ' + compare_diff_patch current expected +' test_expect_success 'test diff.renames=true' ' git -c diff.renames=true diff --cached $tree >current &&
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index 59e71e3acd..8f86dc7274 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh@@ -19,10 +19,10 @@ test_expect_success \ tree=$(git write-tree) && echo $tree' -test_expect_success \ - 'prepare work tree' \ - 'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 && - sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 && + +test_expect_success 'prepare work tree' ' + sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 && + sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 && rm -f COPYING && c1=$(git hash-object COPYING.1) && c2=$(git hash-object COPYING.2) &&
--
2.53.0