From: Junio C Hamano <gitster@pobox.com>
To: Shuqi Liang <cheskaqiqi@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 4/4] t4113: indent with tabs
Date: Thu, 02 Feb 2023 13:10:11 -0800 [thread overview]
Message-ID: <xmqqsffnsrik.fsf@gitster.g> (raw)
In-Reply-To: <20230202171821.10508-5-cheskaqiqi@gmail.com> (Shuqi Liang's message of "Thu, 2 Feb 2023 12:18:21 -0500")
Shuqi Liang <cheskaqiqi@gmail.com> writes:
> t4113-apply-ending.sh used 4-column indent with
> space,fix it in use tabs for indentation.
Good, but end the sentence with a full-top with a space after it,
and start the next sentence with a capital letter.
> Signed-off-by: Shuqi Liang <cheskaqiqi@gmail.com>
> ---
> t/t4113-apply-ending.sh | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/t/t4113-apply-ending.sh b/t/t4113-apply-ending.sh
> index d5b15e97d3..9e28c72355 100755
> --- a/t/t4113-apply-ending.sh
> +++ b/t/t4113-apply-ending.sh
> @@ -23,11 +23,11 @@ echo 'b' >>file
> echo 'c' >>file
>
> test_expect_success setup '
> - git update-index --add file
> + git update-index --add file
> '
This is not wrong per se, but the modern style is to avoid having
any executable lines outside test_expect_foo. I'd expect that the
resulting script begins more like the attached. [PATCH 4/4] stops
the conversion in the middle, which leaves funny taste in our mouth.
Thanks.
diff --git i/t/t4113-apply-ending.sh w/t/t4113-apply-ending.sh
index 66fa51591e..9746f45898 100755
--- i/t/t4113-apply-ending.sh
+++ w/t/t4113-apply-ending.sh
@@ -8,24 +8,20 @@ test_description='git apply trying to add an ending line.
'
. ./test-lib.sh
-# setup
-
-cat >test-patch <<\EOF
-diff --git a/file b/file
---- a/file
-+++ b/file
-@@ -1,2 +1,3 @@
- a
- b
-+c
-EOF
-
-echo 'a' >file
-echo 'b' >>file
-echo 'c' >>file
-
-test_expect_success setup \
- 'git update-index --add file'
+test_expect_success setup '
+ cat >test-patch <<-\EOF
+ diff --git a/file b/file
+ --- a/file
+ +++ b/file
+ @@ -1,2 +1,3 @@
+ a
+ b
+ +c
+ EOF
+
+ test_write_lines a b c >file
+ git update-index --add file
+'
# test
next prev parent reply other threads:[~2023-02-02 21:10 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-31 22:49 [GSoC][PATCH] t/t4113-apply-ending.sh: Modernize a test script Shuqi Liang
2023-02-01 2:21 ` Andrei Rybak
2023-02-02 17:20 ` cheska fran
2023-02-02 17:18 ` [PATCH v2 0/4] t4113: modernize test style Shuqi Liang
2023-02-02 17:18 ` [PATCH v2 1/4]t4113: replace backslash with single quote Shuqi Liang
2023-02-02 21:00 ` Junio C Hamano
2023-02-05 14:28 ` Shuqi Liang
2023-02-02 17:18 ` [PATCH v2 2/4] t4113:put second creation in own step Shuqi Liang
2023-02-02 17:18 ` [PATCH v2 3/4] t4113: use "<<-" instead of "<<" Shuqi Liang
2023-02-02 21:05 ` Junio C Hamano
2023-02-05 14:38 ` Shuqi Liang
2023-02-02 17:18 ` [PATCH v2 4/4] t4113: indent with tabs Shuqi Liang
2023-02-02 21:10 ` Junio C Hamano [this message]
2023-02-05 14:51 ` Shuqi Liang
2023-02-05 14:52 ` [PATCH v3 0/3] modernize style Shuqi Liang
2023-02-05 14:52 ` [PATCH v3 1/3]t4113: modernize a test script Shuqi Liang
2023-02-05 14:52 ` [PATCH v3 2/3] t4113: put executable lines to test_expect_success Shuqi Liang
2023-02-05 14:52 ` [PATCH v3 3/3] t4113: indent with space Shuqi Liang
2023-02-05 20:29 ` Eric Sunshine
2023-02-06 21:17 ` Shuqi Liang
2023-02-06 21:18 ` [PATCH v4 0/3] t4113: modernize style Shuqi Liang
2023-02-06 21:18 ` [PATCH v4 1/3] t4113: modernize test script Shuqi Liang
2023-02-06 21:18 ` [PATCH v4 2/3] t4113: indent with tab Shuqi Liang
2023-02-06 21:18 ` [PATCH v4 3/3] t4113: put executable lines to test_expect_success Shuqi Liang
2023-02-06 21:50 ` Ævar Arnfjörð Bjarmason
2023-02-06 22:44 ` Junio C Hamano
2023-02-06 23:42 ` Shuqi Liang
2023-02-07 8:05 ` Ævar Arnfjörð Bjarmason
2023-02-07 19:55 ` Shuqi Liang
2023-02-08 5:44 ` Shuqi Liang
2023-02-08 7:44 ` Ævar Arnfjörð Bjarmason
2023-02-10 15:29 ` Shuqi Liang
2023-02-15 0:34 ` Eric Sunshine
2023-02-15 0:26 ` Eric Sunshine
2023-02-14 22:17 ` Shuqi Liang
2023-02-14 22:29 ` Junio C Hamano
2023-02-09 15:44 ` [PATCH v5 0/3] t4113: modernize style Shuqi Liang
2023-02-09 15:44 ` [PATCH v5 1/3] t4113: modernize test script Shuqi Liang
2023-02-09 15:44 ` [PATCH v5 2/3] t4113: indent with tab Shuqi Liang
2023-02-15 0:10 ` Eric Sunshine
2023-02-15 0:18 ` Shuqi Liang
2023-02-09 15:44 ` [PATCH v5 3/3] t4113: put executable lines to test_expect_success Shuqi Liang
2023-02-15 1:09 ` Eric Sunshine
2023-02-15 2:40 ` Shuqi Liang
2023-02-15 2:38 ` [PATCH v6 0/3] t4113: modernize style Shuqi Liang
2023-02-15 2:39 ` Shuqi Liang
2023-02-15 2:39 ` [PATCH v6 1/3] t4113: modernize test script Shuqi Liang
2023-02-15 2:39 ` [PATCH v6 2/3] t4113: indent with tab Shuqi Liang
2023-02-15 2:39 ` [PATCH v6 3/3] t4113: put executable lines to test_expect_success Shuqi Liang
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=xmqqsffnsrik.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=cheskaqiqi@gmail.com \
--cc=git@vger.kernel.org \
/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 NNTP newsgroup(s).