From 2c6b6d9f7d8a26b6ae6493584cc3d2a3cbae7358 Mon Sep 17 00:00:00 2001 From: Ralf Thielow Date: Fri, 26 Aug 2016 19:58:36 +0200 Subject: [PATCH] help: make option --help open man pages only for Git commands If option --help is passed to a Git command, we try to open the man page of that command. However, we do it for both commands and concepts. Make sure it is an actual command. This makes "git --help" not working anymore, while "git help " still works. Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano --- git.c | 15 ++++++++++++++- t/t0012-help.sh | 8 ++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/git.c b/git.c index 968a8a4645..6ade0bc938 100644 --- a/git.c +++ b/git.c @@ -522,21 +522,34 @@ static void strip_extension(const char **argv) static void handle_builtin(int argc, const char **argv) { + struct argv_array args = ARGV_ARRAY_INIT; const char *cmd; struct cmd_struct *builtin; strip_extension(argv); cmd = argv[0]; - /* Turn "git cmd --help" into "git help cmd" */ + /* Turn "git cmd --help" into "git help --exclude-guides cmd" */ if (argc > 1 && !strcmp(argv[1], "--help")) { + int i; + argv[1] = argv[0]; argv[0] = cmd = "help"; + + for (i = 0; i < argc; i++) { + argv_array_push(&args, argv[i]); + if (!i) + argv_array_push(&args, "--exclude-guides"); + } + + argc++; + argv = args.argv; } builtin = get_builtin(cmd); if (builtin) exit(run_builtin(builtin, argc, argv)); + argv_array_clear(&args); } static void execv_dashed_external(const char **argv) diff --git a/t/t0012-help.sh b/t/t0012-help.sh index 920a663c3e..8faba2e8bc 100755 --- a/t/t0012-help.sh +++ b/t/t0012-help.sh @@ -41,4 +41,12 @@ test_expect_success "--exclude-guides does not work for guides" ' test_must_be_empty test-browser.log ' +test_expect_success "--help does not work for guides" " + cat <<-EOF >expect && + git: 'revisions' is not a git command. See 'git --help'. + EOF + test_must_fail git revisions --help 2>actual && + test_i18ncmp expect actual +" + test_done