From: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
To: shaoxuan.yuan02@gmail.com
Cc: christian.couder@gmail.com, git@vger.kernel.org,
gitster@pobox.com, sunshine@sunshineco.com
Subject: [PATCH v4 0/2] t/lib-read-tree-m-3way: modernize a test script
Date: Tue, 8 Feb 2022 11:24:48 +0800 [thread overview]
Message-ID: <20220208032450.46604-1-shaoxuan.yuan02@gmail.com> (raw)
In-Reply-To: <20220123060318.471414-1-shaoxuan.yuan02@gmail.com>
== Basic Summary ==
Modernize the test script t/lib-read-tree-m-3way.
Shaoxuan Yuan (2):
t/lib-read-tree-m-3way: modernize style
t/lib-read-tree-m-3way: indent with tabs
t/lib-read-tree-m-3way.sh | 168 +++++++++++++++++++-------------------
1 file changed, 84 insertions(+), 84 deletions(-)
Range-diff against v3:
1: 72323a7a57 ! 1: 6cbca771e5 t/lib-read-tree-m-3way: modernize style
@@ Metadata
## Commit message ##
t/lib-read-tree-m-3way: modernize style
- Many invocations of the test_expect_success command in this
+ Many invocations of the test commands (e.g. test_expect_success
+ or test_expect_failure) in this
file are written in old style where the command, an optional
- prerequisite, and the test title are written on separate
- lines, and the executable script string begins on its own
- line, and these lines are pasted together with backslashes
- as necessary.
+ prerequisite, the test title, and the executable script string
+ are written on separate lines, with the executable script string
+ begins on its own line, and these lines are pasted together
+ with backslashes as necessary.
- An invocation of the test_expect_success command in modern
+ An invocation of the test command in modern
test scripts however writes the prerequisite and the title
- on the same line as the test_expect_success command itself,
+ on the same line as the test command itself,
and ends the line with a single quote that begins the
executable script string.
+ It is worth notice that albeit all executable script strings
+ are changed to use single quotes (for modern style uniformity),
+ some of the test titles are kept untouched, e.g.
+
+ - test_expect_success \
+ - "adding test file $p and Z/$p" \
+ - 'git update-index --add $p &&
+ - git update-index --add Z/$p'
+ + test_expect_success "adding test file $p and Z/$p" '
+ + git update-index --add $p &&
+ + git update-index --add Z/$p
+ + '
+
+ see the "adding test file $p and Z/$p" part.
+
+ This is because the test title is simply echo'd/print'd, and
+ double quotes are necessary for "$p" interpolation; however,
+ the test body (executable script string) gets eval'd, and
+ single quotes are acceptable in this case.
+
Update the style for uniformity.
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
2: 477b71497f ! 2: e5d89ca1de t/lib-read-tree-m-3way: indent with tabs
@@ Commit message
t/lib-read-tree-m-3way: indent with tabs
As Documentation/CodingGuidelines says, our shell scripts
- (including tests) are to use HT for indentation, but this script
- uses 4-column indent with SP. Fix this.
+ (including tests) are to use tabs for indentation, but this script
+ uses 4-column indent with space. Fix this.
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
--
2.35.1
next prev parent reply other threads:[~2022-02-08 3:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 6:03 [GSoC][PATCH] lib-read-tree-m-3way: modernize a test script (style) Shaoxuan Yuan
2022-01-27 10:54 ` Shaoxuan Yuan
2022-01-28 8:34 ` Eric Sunshine
2022-01-28 9:51 ` Shaoxuan Yuan
2022-02-05 11:59 ` Eric Sunshine
2022-02-07 13:10 ` Shaoxuan Yuan
2022-01-30 9:43 ` [PATCH v2 0/2] t/lib-read-tree-m-3way: modernize a test script Shaoxuan Yuan
2022-01-30 9:43 ` [PATCH v2 1/2] t/lib-read-tree-m-3way: replace double quotes with single quotes Shaoxuan Yuan
2022-02-01 23:51 ` Junio C Hamano
2022-02-02 4:52 ` Shaoxuan Yuan
2022-01-30 9:43 ` [PATCH v2 2/2] t/lib-read-tree-m-3way: replace spaces with tabs Shaoxuan Yuan
2022-02-01 23:57 ` Junio C Hamano
2022-02-02 4:59 ` Shaoxuan Yuan
2022-02-02 6:42 ` [PATCH v3 1/2] t/lib-read-tree-m-3way: modernize style Shaoxuan Yuan
2022-02-02 6:43 ` [PATCH v3 2/2] t/lib-read-tree-m-3way: indent with tabs Shaoxuan Yuan
2022-02-07 11:54 ` Christian Couder
2022-02-08 1:47 ` Shaoxuan Yuan
2022-02-07 11:41 ` [PATCH v3 1/2] t/lib-read-tree-m-3way: modernize style Christian Couder
2022-02-08 1:43 ` Shaoxuan Yuan
2022-02-08 3:24 ` Shaoxuan Yuan [this message]
2022-02-08 3:24 ` [PATCH v4 " Shaoxuan Yuan
2022-02-08 3:24 ` [PATCH v4 2/2] t/lib-read-tree-m-3way: indent with tabs Shaoxuan Yuan
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220208032450.46604-1-shaoxuan.yuan02@gmail.com \
--to=shaoxuan.yuan02@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).