From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH 3/3] instaweb: use 'browser..path' config option if it's set. Date: Tue, 29 Jan 2008 07:08:44 +0100 Message-ID: <20080129070844.30781cd3.chriscool@tuxfamily.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org To: Junio Hamano , Eric Wong X-From: git-owner@vger.kernel.org Tue Jan 29 07:03:22 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JJjZ1-0004d1-0D for gcvg-git-2@gmane.org; Tue, 29 Jan 2008 07:03:19 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754767AbYA2GCl (ORCPT ); Tue, 29 Jan 2008 01:02:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754730AbYA2GCk (ORCPT ); Tue, 29 Jan 2008 01:02:40 -0500 Received: from smtp1-g19.free.fr ([212.27.42.27]:32788 "EHLO smtp1-g19.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754531AbYA2GCk (ORCPT ); Tue, 29 Jan 2008 01:02:40 -0500 Received: from smtp1-g19.free.fr (localhost.localdomain [127.0.0.1]) by smtp1-g19.free.fr (Postfix) with ESMTP id 557651AB2BD; Tue, 29 Jan 2008 07:02:39 +0100 (CET) Received: from localhost.boubyland (gre92-7-82-243-130-161.fbx.proxad.net [82.243.130.161]) by smtp1-g19.free.fr (Postfix) with SMTP id 188E01AB2D2; Tue, 29 Jan 2008 07:02:39 +0100 (CET) X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; i486-pc-linux-gnu) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Christian Couder --- Documentation/config.txt | 3 ++- git-instaweb.sh | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 477b2d9..4e222f1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -369,7 +369,8 @@ branch..rebase:: browser..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 ad0723c..3e4452b 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 -- 1.5.4.rc1.24.gf78d