From: "Mark C. Chu-Carroll via B4 Relay" <devnull+markchucarroll.fastmail.com@kernel.org>
To: git@vger.kernel.org
Cc: "Mark C. Chu-Carroll" <markchucarroll@fastmail.com>
Subject: [PATCH 2/3] Update t4009 to use modern style.
Date: Tue, 08 Sep 2026 15:44:54 -0400 [thread overview]
Message-ID: <20260908-modernize-t4001-v1-2-cab3933a173f@fastmail.com> (raw)
In-Reply-To: <20260908-modernize-t4001-v1-0-cab3933a173f@fastmail.com>
From: "Mark C. Chu-Carroll" <markchucarroll@fastmail.com>
---
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
next prev parent reply other threads:[~2026-09-08 19:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-08 19:44 [PATCH 0/3] Update t40* tests to use modern style Mark C. Chu-Carroll via B4 Relay
2026-09-08 19:44 ` [PATCH 1/3] Update t4001 to use modern syntax Mark C. Chu-Carroll via B4 Relay
2026-09-08 20:48 ` Junio C Hamano
2026-09-08 19:44 ` Mark C. Chu-Carroll via B4 Relay [this message]
2026-09-08 19:44 ` [PATCH 3/3] Update t4010 to use modern style Mark C. Chu-Carroll via B4 Relay
2026-09-10 17:07 ` [PATCH v2 0/3] Update t40* tests " Mark C. Chu-Carroll via B4 Relay
2026-09-10 17:07 ` [PATCH v2 1/3] Update t4001 to use modern syntax Mark C. Chu-Carroll via B4 Relay
2026-09-10 17:56 ` Junio C Hamano
2026-09-10 17:07 ` [PATCH v2 2/3] Update t4009 to use modern style Mark C. Chu-Carroll via B4 Relay
2026-09-10 17:07 ` [PATCH v2 3/3] Update t4010 " Mark C. Chu-Carroll via B4 Relay
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260908-modernize-t4001-v1-2-cab3933a173f@fastmail.com \
--to=devnull+markchucarroll.fastmail.com@kernel.org \
--cc=git@vger.kernel.org \
--cc=markchucarroll@fastmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox