diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2008-01-29 07:08:44 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-29 00:49:28 -0800 |
| commit | ab989adf6ab32fb80fd42cc95ed0eacb029258fe (patch) | |
| tree | 219fb3317f3126a3eddce99edf33bbec873e9dc0 | |
| parent | f7ff09d7188aaa60710aa2e6d0da19b70adac2f1 (diff) | |
| download | git-ab989adf6ab32fb80fd42cc95ed0eacb029258fe.tar.gz git-ab989adf6ab32fb80fd42cc95ed0eacb029258fe.tar.xz | |
instaweb: use 'browser.<tool>.path' config option if it's set.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 3 | ||||
| -rwxr-xr-x | git-instaweb.sh | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 477b2d913..4e222f15a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -369,7 +369,8 @@ branch.<name>.rebase:: browser.<tool>.path:: Override the path for the given tool that may be used to - browse HTML help. See '-w' option in linkgit:git-help[1]. + browse HTML help (see '-w' option in linkgit:git-help[1]) or a + working repository in gitweb (see linkgit:git-instaweb[1]). clean.requireForce:: A boolean to make git-clean do nothing unless given -f diff --git a/git-instaweb.sh b/git-instaweb.sh index ad0723ccc..3e4452bc4 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -274,6 +274,14 @@ webrick) ;; esac +init_browser_path() { + browser_path="`git config browser.$1.path`" + test -z "$browser_path" && browser_path="$1" +} + start_httpd url=http://127.0.0.1:$port -test -n "$browser" && "$browser" $url || echo $url +test -n "$browser" && { + init_browser_path "$browser" + "$browser_path" $url +} || echo $url |