From: Chris Webb <chris@arachsys.com>
Date: Thu, 28 Jun 2012 06:58:03 +0000 (+0100)
Subject: Allow help.htmlpath to be a URL prefix
X-Git-Tag: v1.7.12-rc0~49^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86272b4ffeb38fb4fb1da3603bba1094fab3731b;p=git.git

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 9e36fb4cc..0c698b18c 100644
--- 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. */
-	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);