diff options
| author | Usman Akinyemi <usmanakinyemi202@gmail.com> | 2025-04-08 01:28:41 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 14:47:37 -0700 |
| commit | 9ec327d922298f7adfa366c1d1ab2a795985c51e (patch) | |
| tree | 39ac2e01b1c21300fdd9be10ed4ff81c1f94d606 | |
| parent | 66b90d9bad8476f6f3d71f5add5cf78809a998ed (diff) | |
| download | git-9ec327d922298f7adfa366c1d1ab2a795985c51e.tar.xz | |
builtin/update-server-info: remove unnecessary if statement
Since we already teach the `repo_config()` in f29f1990 (config:
teach repo_config to allow `repo` to be NULL, 2025-03-08) 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/update-server-info.c | 4 | ||||
| -rwxr-xr-x | 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 |