Allow help.htmlpath to be a URL prefix

Setting this to a URL prefix instead of a path to a local directory allows
git-help --web to work even when HTML docs aren't locally installed, by
pointing the browser at a copy accessible on the web. For example,

[help]
format = html
htmlpath = http://git-scm.com/docs

will use the publicly available documentation on the git homepage.

Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/help.c b/builtin/help.c
index 9e36fb4cc708e12e1fc60903239f3b5967835954..0c698b18c8467a284c223d1e7e395d31f03352fd 100644 (file)
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -395,9 +395,11 @@ static void get_html_page_path(struct strbuf *page_path, const char *page)
                html_path = system_path(GIT_HTML_PATH);
 
        /* Check that we have a git documentation directory. */
                html_path = system_path(GIT_HTML_PATH);
 
        /* Check that we have a git documentation directory. */

-       if (stat(mkpath("%s/git.html", html_path), &st)
-           || !S_ISREG(st.st_mode))
-               die(_("'%s': not a documentation directory."), html_path);
+       if (!strstr(html_path, "://")) {
+               if (stat(mkpath("%s/git.html", html_path), &st)
+                   || !S_ISREG(st.st_mode))
+                       die("'%s': not a documentation directory.", html_path);
+       }

 
        strbuf_init(page_path, 0);
        strbuf_addf(page_path, "%s/%s.html", html_path, page);
 
        strbuf_init(page_path, 0);
        strbuf_addf(page_path, "%s/%s.html", html_path, page);