[PATCH 2/3] Update t4009 to use modern style.
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
From: "Mark C. Chu-Carroll" <redacted> --- t/t4009-diff-rename-4.sh | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index 8f86dc7274..198de5d039 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh@@ -10,15 +10,14 @@ test_description='Same rename detection as t4003 but testing diff-raw -z. . ./test-lib.sh . "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash -test_expect_success \ - 'prepare reference tree' \ - 'COPYING_test_data >COPYING && - echo frotz >rezrov && +test_expect_success 'prepare reference tree' ' + COPYING_test_data >COPYING && + echo frotz >rezrov && git update-index --add COPYING rezrov && orig=$(git hash-object COPYING) && tree=$(git write-tree) && - echo $tree' - + echo $tree +' test_expect_success 'prepare work tree' ' sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 &&
@@ -26,7 +25,8 @@ test_expect_success 'prepare work tree' ' rm -f COPYING && c1=$(git hash-object COPYING.1) && c2=$(git hash-object COPYING.2) && - git update-index --add --remove COPYING COPYING.?' + git update-index --add --remove COPYING COPYING.? +' # tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2, # both are slightly edited, and unchanged rezrov. We say COPYING.1
@@ -44,16 +44,16 @@ COPYING COPYING.2 EOF -test_expect_success \ - 'validate output from rename/copy detection (#1)' \ - 'compare_diff_raw_z current expected' +test_expect_success 'validate output from rename/copy detection (#1)' ' + compare_diff_raw_z current expected +' ################################################################ -test_expect_success \ - 'prepare work tree again' \ - 'mv COPYING.2 COPYING && - git update-index --add --remove COPYING COPYING.1 COPYING.2' +test_expect_success 'prepare work tree again' ' + mv COPYING.2 COPYING && + git update-index --add --remove COPYING COPYING.1 COPYING.2 +' # tree has COPYING and rezrov. work tree has COPYING and COPYING.1, # both are slightly edited, and unchanged rezrov. We say COPYING.1
@@ -69,9 +69,9 @@ COPYING COPYING.1 EOF -test_expect_success \ - 'validate output from rename/copy detection (#2)' \ - 'compare_diff_raw_z current expected' +test_expect_success 'validate output from rename/copy detection (#2)' ' + compare_diff_raw_z current expected +' ################################################################
@@ -80,10 +80,10 @@ test_expect_success \ # anything about rezrov or COPYING, since the revised again diff-raw # nows how to say Copy. -test_expect_success \ - 'prepare work tree once again' \ - 'COPYING_test_data >COPYING && - git update-index --add --remove COPYING COPYING.1' +test_expect_success 'prepare work tree once again' ' + COPYING_test_data >COPYING && + git update-index --add --remove COPYING COPYING.1 +' git diff-index -z -C --find-copies-harder $tree >current cat >expected <<EOF
@@ -92,8 +92,8 @@ COPYING COPYING.1 EOF -test_expect_success \ - 'validate output from rename/copy detection (#3)' \ - 'compare_diff_raw_z current expected' +test_expect_success 'validate output from rename/copy detection (#3)' ' + compare_diff_raw_z current expected +' test_done
--
2.53.0