[PATCH v2 1/1] builtin/update-server-info: remove unnecessary if statement
- From
Usman Akinyemi <usmanakinyemi202@gmail.com>
- Date
- Apr 6, 2025, 12:14 UTC
- Message-ID
- <20250406121513.154084-2-usmanakinyemi202@gmail.com>
- In-Reply-To
- <20250406121513.154084-1-usmanakinyemi202@gmail.com>
Since we already teach the `repo_config()` in "1a764cdbdc (Merge branch 'ua/some-builtins-wo-the-repository', 2025-03-26)" to allow `repo` to be NULL, no need to check if `repo` is NULL before calling `repo_config()`.
Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com> --- builtin/update-server-info.c | 4 ++-- t/t1517-outside-repo.sh | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c index d7467290a8..ba702d30ef 100644 --- a/builtin/update-server-info.c +++ b/builtin/update-server-info.c @@ -20,8 +20,8 @@ int cmd_update_server_info(int argc, OPT_END() }; - if (repo) - repo_config(repo, git_default_config, NULL); + repo_config(repo, git_default_config, NULL); + argc = parse_options(argc, argv, prefix, options, update_server_info_usage, 0); if (argc > 0) diff --git a/t/t1517-outside-repo.sh b/t/t1517-outside-repo.sh index dbd8cd6906..6824581317 100755 --- a/t/t1517-outside-repo.sh +++ b/t/t1517-outside-repo.sh @@ -107,4 +107,11 @@ 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 && + test_expect_code 129 nongit git update-server-info -h >usage && + test_grep "[Uu]sage: git update-server-info " usage +' + test_done
-- 2.49.0