summaryrefslogtreecommitdiff
path: root/git-instaweb.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-10-16 23:32:03 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-10-16 23:32:03 -0400
commit317efa63fc457d1a726902ddf97298c201df627c (patch)
treed4f38c3fd8ec2a422c4db76e00b784f760540f1f /git-instaweb.sh
parent54f0db79ca11d08a448e45cfcb6e4304c6d16014 (diff)
parent09955207d148c5f3964002b7f3a4e13db3050777 (diff)
downloadgit-317efa63fc457d1a726902ddf97298c201df627c.tar.gz
Merge branch 'maint'
* maint: Document additional 1.5.3.5 fixes in release notes Avoid 'expr index' on Mac OS X as it isn't supported filter-branch: update current branch when rewritten fix filter-branch documentation helpful error message when send-pack finds no refs in common. Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE Correct typos in release notes for 1.5.3.5
Diffstat (limited to 'git-instaweb.sh')
-rwxr-xr-xgit-instaweb.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 2e4eeccace..95c3e5aa1f 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -30,8 +30,7 @@ test -z "$port" && port=1234
start_httpd () {
httpd_only="`echo $httpd | cut -f1 -d' '`"
- if test "`expr index $httpd_only /`" -eq '1' || \
- which $httpd_only >/dev/null
+ if case "$httpd_only" in /*) : ;; *) which $httpd_only >/dev/null;; esac
then
$httpd $fqgitdir/gitweb/httpd.conf
else