Merge branch 'jc/maint-1.6.0-keep-pack' into maint

[git.git] / builtin-help.c

diff --git a/builtin-help.c b/builtin-help.c
index 64207cbfe909d17ea9698d3ff680203eee9f5c01..9b57a746185719eb43c962c4adb96283657692e9 100644 (file)
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -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);
@@ -377,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);
 }