Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 08362f43c0828ad52f1c0c52904dabe237fa90ec..cbc7418e3501b37a701a5177157733d97b405376 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -15,11 +15,11 @@ case "$GIT_DIR" in
        fqgitdir="$PWD/$GIT_DIR" ;;
 esac
 
-local="`git repo-config --bool --get instaweb.local`"
-httpd="`git repo-config --get instaweb.httpd`"
-browser="`git repo-config --get instaweb.browser`"
-port=`git repo-config --get instaweb.port`
-module_path="`git repo-config --get instaweb.modulepath`"
+local="`git config --bool --get instaweb.local`"
+httpd="`git config --get instaweb.httpd`"
+browser="`git config --get instaweb.browser`"
+port=`git config --get instaweb.port`
+module_path="`git config --get instaweb.modulepath`"
 
 conf=$GIT_DIR/gitweb/httpd.conf
 
@@ -53,6 +53,9 @@ start_httpd () {
                                return
                        fi
                done
+               echo "$httpd_only not found. Install $httpd_only or use" \
+                    "--httpd to specify another http daemon."
+               exit 1
        fi
        if test $? != 0; then
                echo "Could not execute http daemon $httpd."