summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2009-09-04 12:22:36 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-28 10:42:17 -0700
commit7c3baa9abf0abe15f068d95688bbc27e73a69042 (patch)
tree8ac47157f6b11c5d69cb320dd5b1d504e0d71f25
parentMerge branch 'maint-1.6.4' into maint (diff)
downloadtgif-7c3baa9abf0abe15f068d95688bbc27e73a69042.tar.xz
help -a: do not unnecessarily look for a repository
Although 'git help -a' actually doesn't need to be run inside a git repository and uses no repository-specific information, it looks for a git directory. On 'git <TAB><TAB>' the bash completion runs 'git help -a' and unnecessary searching for a git directory can be annoying in auto-mount environments. With this commit, 'git help' no longer searches for a repository when run with the -a option. Reported by Vincent Danjean through http://bugs.debian.org/539273 Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-help.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-help.c b/builtin-help.c
index e1ade8edd3..ca08519d9d 100644
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -417,9 +417,6 @@ int cmd_help(int argc, const char **argv, const char *prefix)
const char *alias;
load_command_list("git-", &main_cmds, &other_cmds);
- setup_git_directory_gently(&nongit);
- git_config(git_help_config, NULL);
-
argc = parse_options(argc, argv, prefix, builtin_help_options,
builtin_help_usage, 0);
@@ -430,6 +427,9 @@ int cmd_help(int argc, const char **argv, const char *prefix)
return 0;
}
+ setup_git_directory_gently(&nongit);
+ git_config(git_help_config, NULL);
+
if (!argv[0]) {
printf("usage: %s\n\n", git_usage_string);
list_common_cmds_help();