Rename load_repo_config() to load_git_config()

[tig] / tig.c

diff --git a/tig.c b/tig.c
index c41f2b2..551100f 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -5621,7 +5621,7 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen
 }
 
 static int
-load_repo_config(void)
+load_git_config(void)
 {
        return read_properties(popen(GIT_CONFIG " --list", "r"),
                               "=", read_repo_config_option);
@@ -5776,9 +5776,7 @@ main(int argc, char *argv[])
        if (load_options() == ERR)
                die("Failed to load user config.");
 
-       /* Load the repo config file so options can be overwritten from
-        * the command line. */
-       if (load_repo_config() == ERR)
+       if (load_git_config() == ERR)
                die("Failed to load repo config.");
 
        if (!parse_options(argc, argv))
@@ -5797,7 +5795,7 @@ main(int argc, char *argv[])
                        die("Failed to initialize character set conversion");
        }
 
-       if (load_refs() == ERR)
+       if (*opt_git_dir && load_refs() == ERR)
                die("Failed to load refs.");
 
        for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)