From: "John Cai via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: John Cai <johncai86@gmail.com>, John Cai <johncai86@gmail.com>
Subject: [PATCH 11/20] t4003-diff-rename-1: modernize test format
Date: Thu, 18 May 2023 20:03:16 +0000 [thread overview]
Message-ID: <bb9abb10c6ed11a6ab528e09fca67cf1b0e29a18.1684440206.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1513.git.git.1684440205.gitgitgadget@gmail.com>
From: John Cai <johncai86@gmail.com>
Some tests still use the old format with four spaces indentation.
Standardize the tests to the new format with tab indentation.
Signed-off-by: John Cai <johncai86@gmail.com>
---
t/t4003-diff-rename-1.sh | 62 ++++++++++++++++++++--------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh
index 181e9683a79..ebe091828c8 100755
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh
@@ -11,20 +11,20 @@ TEST_PASSES_SANITIZE_LEAK=true
. ./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 &&
- git update-index --add COPYING rezrov &&
- 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 &&
- rm -f COPYING &&
- git update-index --add --remove COPYING COPYING.?'
+test_expect_success 'prepare reference tree' '
+ COPYING_test_data >COPYING &&
+ echo frotz >rezrov &&
+ git update-index --add COPYING rezrov &&
+ 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 &&
+ rm -f 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. So we say you
@@ -57,14 +57,14 @@ rename to COPYING.2
+ This file is licensed under the G.P.L v2, or a later version
EOF
-test_expect_success \
- 'validate output from rename/copy detection (#1)' \
- 'compare_diff_patch current expected'
+test_expect_success 'validate output from rename/copy detection (#1)' '
+ compare_diff_patch 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. So we say you
@@ -95,14 +95,14 @@ copy to COPYING.1
+ However, in order to allow a migration to GPLv3 if that seems like
EOF
-test_expect_success \
- 'validate output from rename/copy detection (#2)' \
- 'compare_diff_patch current expected'
+test_expect_success 'validate output from rename/copy detection (#2)' '
+ compare_diff_patch current expected
+'
-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
+'
# tree has COPYING and rezrov. work tree has COPYING and COPYING.1,
# but COPYING is not edited. We say you copy-and-edit COPYING.1; this
@@ -123,8 +123,8 @@ copy to COPYING.1
+ However, in order to allow a migration to GPLv3 if that seems like
EOF
-test_expect_success \
- 'validate output from rename/copy detection (#3)' \
- 'compare_diff_patch current expected'
+test_expect_success 'validate output from rename/copy detection (#3)' '
+ compare_diff_patch current expected
+'
test_done
--
gitgitgadget
next prev parent reply other threads:[~2023-05-18 20:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-18 20:03 [PATCH 00/20] tests: modernize test format John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 01/20] t1000-basic: " John Cai via GitGitGadget
2023-05-18 21:20 ` Eric Sunshine
2023-05-18 20:03 ` [PATCH 02/20] t0030-stripspace: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 03/20] t3210-pack-refs: " John Cai via GitGitGadget
2023-05-19 17:07 ` Junio C Hamano
2023-05-19 17:52 ` John Cai
2023-05-19 18:34 ` Junio C Hamano
2023-05-18 20:03 ` [PATCH 04/20] t1001-read-tree-m-2way: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 05/20] t1002-read-tree-m-u-2way: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 06/20] t1006-cat-file: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 07/20] t3500-cherry: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 08/20] t3700-add: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 09/20] t3903-stash: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 10/20] t4002-diff-basic: " John Cai via GitGitGadget
2023-05-18 20:03 ` John Cai via GitGitGadget [this message]
2023-05-18 20:03 ` [PATCH 12/20] t4004-diff-rename-symlink: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 13/20] t4202-log: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 14/20] t4206-log-follow-harder-copies: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 15/20] t5300-pack-object: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 16/20] t5301-sliding-window: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 17/20] t5303-pack-corruption-resilience: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 18/20] t5306-pack-nobase: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 19/20] t6050-replace: " John Cai via GitGitGadget
2023-05-18 20:03 ` [PATCH 20/20] t7101-reset-empty-subdirs: " John Cai via GitGitGadget
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=bb9abb10c6ed11a6ab528e09fca67cf1b0e29a18.1684440206.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johncai86@gmail.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).