threads / patch / 60025

patcht4002: fix test #63 (missing whitespace)

Subject: [PATCH] t4002: fix test #63 (missing whitespace)

## tl;dr

3 messages between Jul 25, 2023 and Jul 25, 2023. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Andreas Herrmann· Jul 25, 2023, 06:34 UTC · lore

Add missing whitespace between 'test_expect_success' and test case description for last test. Without this, we get:

t4002-diff-basic.sh: line 412: test_expect_successdiff can read from stdin: command not found

Signed-off-by: Andreas Herrmann <aherrmann@suse.de>
---
 t/t4002-diff-basic.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Show changes to t/t4002-diff-basic.sh +3 −2

diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index d524d4057d..e6b6739426 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -401,9 +401,10 @@ test_expect_success 'diff-tree B A == diff-tree -R A B' '
 test_expect_success 'diff-tree -r B A == diff-tree -r -R A B' '
 	git diff-tree -r $tree_B $tree_A >.test-a &&
 	git diff-tree -r -R $tree_A $tree_B >.test-b &&
-	cmp -s .test-a .test-b'
+	cmp -s .test-a .test-b
+'
 
-test_expect_success'diff can read from stdin' '
+test_expect_success 'diff can read from stdin' '
 	test_must_fail git diff --no-index -- MN - < NN |
 		grep -v "^index" | sed "s#/-#/NN#" >.test-a &&
 	test_must_fail git diff --no-index -- MN NN |

-- 
2.41.0

Eric Sunshine· Jul 25, 2023, 07:10 UTC · re: Andreas Herrmann · lore

Re: [PATCH] t4002: fix test #63 (missing whitespace)

On Tue, Jul 25, 2023 at 2:48 AM Andreas Herrmann <aherrmann@suse.de> wrote:

Show 6 quoted lines

> Add missing whitespace between 'test_expect_success' and test case
> description for last test. Without this, we get:
>
> t4002-diff-basic.sh: line 412: test_expect_successdiff can read from stdin: command not found
>
> Signed-off-by: Andreas Herrmann <aherrmann@suse.de>

Thanks for finding this problem and submitting a fix. You're the second person to do so[1].

[1]: https://lore.kernel.org/git/pull.1545.git.git.1689341410476.gitgitgadget@gmail.com/

Show 8 quoted lines

> diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
> @@ -401,9 +401,10 @@ test_expect_success 'diff-tree B A == diff-tree -R A B' '
>  test_expect_success 'diff-tree -r B A == diff-tree -r -R A B' '
>         git diff-tree -r $tree_B $tree_A >.test-a &&
>         git diff-tree -r -R $tree_A $tree_B >.test-b &&
> -       cmp -s .test-a .test-b'
> +       cmp -s .test-a .test-b
> +'

This minor style fixup could be resubmitted as a standalone patch, though it might be too minor to worry about.

Show 5 quoted lines

> -test_expect_success'diff can read from stdin' '
> +test_expect_success 'diff can read from stdin' '
>         test_must_fail git diff --no-index -- MN - < NN |
>                 grep -v "^index" | sed "s#/-#/NN#" >.test-a &&
>         test_must_fail git diff --no-index -- MN NN |

Junio C Hamano· Jul 25, 2023, 16:49 UTC · re: Eric Sunshine · lore

Re: [PATCH] t4002: fix test #63 (missing whitespace)

Eric Sunshine <sunshine@sunshineco.com> writes:

Show 16 quoted lines

> Thanks for finding this problem and submitting a fix. You're the
> second person to do so[1].
>
> [1]: https://lore.kernel.org/git/pull.1545.git.git.1689341410476.gitgitgadget@gmail.com/
>
>> diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
>> @@ -401,9 +401,10 @@ test_expect_success 'diff-tree B A == diff-tree -R A B' '
>>  test_expect_success 'diff-tree -r B A == diff-tree -r -R A B' '
>>         git diff-tree -r $tree_B $tree_A >.test-a &&
>>         git diff-tree -r -R $tree_A $tree_B >.test-b &&
>> -       cmp -s .test-a .test-b'
>> +       cmp -s .test-a .test-b
>> +'
>
> This minor style fixup could be resubmitted as a standalone patch,
> though it might be too minor to worry about.

Thanks for a quick review and encouraging words. I do not mind a patch with only the above hunk but of course the title and the log message would have to be updated ;-).