git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-03 14:50:24 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

repo: show subcommand-specific help text

Browse Source 
Use subcommand-specific usage arrays for "git repo info" and
"git repo structure" so that each command shows only its own
synopsis in help output.

Add tests to cover the subcommand help behavior.

Signed-off-by: Mahi Kassa <mahlet.takassa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mahi Kassa
2026-03-25 12:51:48 +01:00
committed by Junio C Hamano
parent 4be77c732c
commit abd728cdf6
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/repo.c
View File

@@ -33,6 +33,16 @@ static const char *const repo_usage[] = {
NULL,
};
static const char *const repo_info_usage[] = {
REPO_INFO_USAGE,
NULL,
};
static const char *const repo_structure_usage[] = {
REPO_STRUCTURE_USAGE,
NULL,
};
typedef int get_value_fn(struct repository *repo, struct strbuf *buf);
enum output_format {
@@ -220,7 +230,7 @@ static int cmd_repo_info(int argc, const char **argv, const char *prefix,
OPT_END()
};
argc = parse_options(argc, argv, prefix, options, repo_usage, 0);
argc = parse_options(argc, argv, prefix, options, repo_info_usage, 0);
if (show_keys && (all_keys || argc))
die(_("--keys cannot be used with a <key> or --all"));
@@ -885,7 +895,7 @@ static int cmd_repo_structure(int argc, const char **argv, const char *prefix,
OPT_END()
};
argc = parse_options(argc, argv, prefix, options, repo_usage, 0);
argc = parse_options(argc, argv, prefix, options, repo_structure_usage, 0);
if (argc)
usage(_("too many arguments"));

6
t/t1900-repo-info.sh
View File

@@ -149,4 +149,10 @@ test_expect_success 'git repo info --keys uses lines as its default output forma
test_cmp expect actual
'
test_expect_success 'git repo info -h shows only repo info usage' '
test_must_fail git repo info -h >actual &&
test_grep "git repo info" actual &&
test_grep ! "git repo structure" actual
'
test_done

6
t/t1901-repo-structure.sh
View File

@@ -224,4 +224,10 @@ test_expect_success 'progress meter option' '
)
'
test_expect_success 'git repo structure -h shows only repo structure usage' '
test_must_fail git repo structure -h >actual &&
test_grep "git repo structure" actual &&
test_grep ! "git repo info" actual
'
test_done