[PATCH] t5000: modernise archive and :(glob) test

Kostya Farber· Feb 4, 2023, 20:41 UTC · lore

To match present day coding guiding codelines let's:

- use <<-EOF, so we can indent all lines to the
  the same level for this test

- use <<\EOF to notify the reader that no interpolation
  is exepected in the body

Signed-off-by: Kostya Farber <kostya.farber@gmail.com>
---
 t/t5000-tar-tree.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Show changes to t/t5000-tar-tree.sh +5 −5

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index d473048138..eb3214bc17 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -402,11 +402,11 @@ test_expect_success GZIP 'extract tgz file (external gzip)' '
 
 test_expect_success 'archive and :(glob)' '
 	git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
-	cat >expect <<EOF &&
-a/
-a/bin/
-a/bin/sh
-EOF
+	cat >expect <<-\EOF &&
+	a/
+	a/bin/
+	a/bin/sh
+	EOF
 	test_cmp expect actual
 '

-- 
2.39.0

Eric Sunshine· Feb 5, 2023, 18:10 UTC · re: Kostya Farber · lore

Re: [PATCH] t5000: modernise archive and :(glob) test

On Sat, Feb 4, 2023 at 3:54 PM Kostya Farber <kostya.farber@gmail.com> wrote:

> To match present day coding guiding codelines let's:

We can probably just say "coding guidelines" rather than "coding guiding codelines".

Show 5 quoted lines

> - use <<-EOF, so we can indent all lines to the
>   the same level for this test
>
> - use <<\EOF to notify the reader that no interpolation
>   is exepected in the body

s/exepected/expected/

> Signed-off-by: Kostya Farber <kostya.farber@gmail.com>
> ---

For other reviewers who may not have been following along, this is a suggested replacement[1] to a rejected (by me[2]) GSoC microproject[3].

Show 16 quoted lines

> diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
> @@ -402,11 +402,11 @@ test_expect_success GZIP 'extract tgz file (external gzip)' '
>  test_expect_success 'archive and :(glob)' '
>         git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
> -       cat >expect <<EOF &&
> -a/
> -a/bin/
> -a/bin/sh
> -EOF
> +       cat >expect <<-\EOF &&
> +       a/
> +       a/bin/
> +       a/bin/sh
> +       EOF
>         test_cmp expect actual
>  '

Thanks, these changes look fine.

[1]: https://lore.kernel.org/git/CAPig+cR+1bxgitSmJ47PxD=CPxJjMh5Vm+zRdVU8iEo9pvtutw@mail.gmail.com/ [2]: https://lore.kernel.org/git/CAPig+cTC4TUK2NXFmP6ymEYYjYAmCSd53dzFhKn0ido8x6uh1Q@mail.gmail.com/ [3]: https://lore.kernel.org/git/20230202202557.19297-1-kostya.farber@gmail.com/

patcht5000: modernise archive and :(glob) test