Merge branch 'maint'

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