more D/F conflict tests

diff --git a/builtin-help.c b/builtin-help.c
index ca08519d9d6290f3cda4ee92e29e4acbf8325d0c..09ad4b04f9fa860a32580717e61acc942de23388 100644 (file)
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -427,9 +427,6 @@ 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();
@@ -437,6 +434,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);
+
        alias = alias_lookup(argv[0]);
        if (alias && !is_git_command(argv[0])) {
                printf("`git %s' is aliased to `%s'\n", argv[0], alias);