lstat_cache(): print a warning if doing ping-pong between cache types

diff --git a/builtin-help.c b/builtin-help.c
index 391f749376620c759c5147c6afcb4fca0d1bba40..9b57a746185719eb43c962c4adb96283657692e9 100644 (file)
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -273,7 +273,7 @@ static int git_help_config(const char *var, const char *value, void *cb)
        return git_default_config(var, value, cb);
 }
 
-struct cmdnames main_cmds, other_cmds;
+static struct cmdnames main_cmds, other_cmds;
 
 void list_common_cmds_help(void)
 {
@@ -322,16 +322,14 @@ static const char *cmd_to_page(const char *git_cmd)
 
 static void setup_man_path(void)
 {
-       struct strbuf new_path;
+       struct strbuf new_path = STRBUF_INIT;
        const char *old_path = getenv("MANPATH");
 
-       strbuf_init(&new_path, 0);
-
        /* We should always put ':' after our path. If there is no
         * old_path, the ':' at the end will let 'man' to try
         * system-wide paths after ours to find the manual page. If
         * there is old_path, we need ':' as delimiter. */
-       strbuf_addstr(&new_path, GIT_MAN_PATH);
+       strbuf_addstr(&new_path, system_path(GIT_MAN_PATH));
        strbuf_addch(&new_path, ':');
        if (old_path)
                strbuf_addstr(&new_path, old_path);
@@ -361,12 +359,15 @@ static void show_man_page(const char *git_cmd)
 {
        struct man_viewer_list *viewer;
        const char *page = cmd_to_page(git_cmd);
+       const char *fallback = getenv("GIT_MAN_VIEWER");
 
        setup_man_path();
        for (viewer = man_viewer_list; viewer; viewer = viewer->next)
        {
                exec_viewer(viewer->name, page); /* will return when unable */
        }
+       if (fallback)
+               exec_viewer(fallback, page);
        exec_viewer("man", page);
        die("no man viewer handled the request");
 }
@@ -374,7 +375,7 @@ static void show_man_page(const char *git_cmd)
 static void show_info_page(const char *git_cmd)
 {
        const char *page = cmd_to_page(git_cmd);
-       setenv("INFOPATH", GIT_INFO_PATH, 1);
+       setenv("INFOPATH", system_path(GIT_INFO_PATH), 1);
        execlp("info", "info", "gitman", page, NULL);
 }
 
@@ -418,7 +419,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 {
        int nongit;
        const char *alias;
-       unsigned int longest = load_command_list("git-", &main_cmds, &other_cmds);
+       load_command_list("git-", &main_cmds, &other_cmds);
 
        setup_git_directory_gently(&nongit);
        git_config(git_help_config, NULL);
@@ -428,7 +429,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 
        if (show_all) {
                printf("usage: %s\n\n", git_usage_string);
-               list_commands("git commands", longest, &main_cmds, &other_cmds);
+               list_commands("git commands", &main_cmds, &other_cmds);
                printf("%s\n", git_more_info_string);
                return 0;
        }