Re: [PATCH v4 2/2] t5200: move `update-server-info -h` test from t1517

From: D. Ben Knoble <ben.knoble@gmail.com>
Date: Jul 26, 2025, 16:02 UTC
Message-ID: <CALnO6CDvwbMK_GRdLOBFVdW1XZ5JTuB+Uo5JVPY3Pw_noNBYzA@mail.gmail.com>
In-Reply-To: <20250721115519.140361-3-usmanakinyemi202@gmail.com>

On Mon, Jul 21, 2025 at 7:55 AM Usman Akinyemi <usmanakinyemi202@gmail.com> wrote:

Show 40 quoted lines

>
> t1517 is now focused on testing subcommands outside a repository.
> Move the in-repo `-h` test for `update-server-info` to t5200,
> which covers this command.
>
> Suggested-by: Patrick Steinhardt <ps@pks.im>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com>
> ---
>  t/t1517-outside-repo.sh       | 5 -----
>  t/t5200-update-server-info.sh | 5 +++++
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/t/t1517-outside-repo.sh b/t/t1517-outside-repo.sh
> index 9fcebb7d94..a1c644dffa 100755
> --- a/t/t1517-outside-repo.sh
> +++ b/t/t1517-outside-repo.sh
> @@ -107,11 +107,6 @@ test_expect_success LIBCURL 'remote-http outside repository' '
>         test_grep "^error: remote-curl" actual
>  '
>
> -test_expect_success 'update-server-info does not crash with -h' '
> -       test_expect_code 129 git update-server-info -h >usage &&
> -       test_grep "[Uu]sage: git update-server-info " usage &&
> -'
> -
>  for cmd in $(git --list-cmds=main)
>  do
>         cmd=${cmd%.*} # strip .sh, .perl, etc.
> diff --git a/t/t5200-update-server-info.sh b/t/t5200-update-server-info.sh
> index 8365907055..a1f129db4e 100755
> --- a/t/t5200-update-server-info.sh
> +++ b/t/t5200-update-server-info.sh
> @@ -46,4 +46,9 @@ test_expect_success 'midx does not create duplicate pack entries' '
>         test_must_be_empty dups
>  '
>
> +test_expect_success 'update-server-info does not crash with -h' '
> +       test_expect_code 129 git update-server-info -h >usage &&
> +       test_grep "[Uu]sage: git update-server-info " usage &&

One other fix I needed locally: in neither the preimage nor postimage should this have a trailing "&&"

Show 7 quoted lines

> +'
> +
>  test_done
> --
> 2.50.0
>
>

-- 
D. Ben Knoble