Re: [PATCH v2 4/4] t4113: indent with tabs

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 2, 2023, 21:10 UTC
Message-ID: <xmqqsffnsrik.fsf@gitster.g>
In-Reply-To: <20230202171821.10508-5-cheskaqiqi@gmail.com>

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.

Show 16 quoted lines

> 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