diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-30 23:42:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-30 23:42:10 -0700 |
| commit | c1a788aceecb0a8e95d6442938ade9ca43df033e (patch) | |
| tree | 30d99ae60a57281f75586d64f9853429fa3d26e7 /git-instaweb.sh | |
| parent | f59aac47f3839367d0da04019b0fc2bd61345225 (diff) | |
| parent | 076b0adcf9dac7bd9d18624087f679cc811aeb77 (diff) | |
| download | git-c1a788aceecb0a8e95d6442938ade9ca43df033e.tar.xz | |
Merge branch 'js/read-tree' into js/c-merge-recursive
* js/read-tree: (107 commits)
read-tree: move merge functions to the library
read-trees: refactor the unpack_trees() part
tar-tree: illustrate an obscure feature better
git.c: allow alias expansion without a git directory
setup_git_directory_gently: do not barf when GIT_DIR is given.
Build on Debian GNU/kFreeBSD
Call setup_git_directory() much earlier
Call setup_git_directory() early
Display an error from update-ref if target ref name is invalid.
Fix http-fetch
t4103: fix binary patch application test.
git-apply -R: binary patches are irreversible for now.
Teach git-apply about '-R'
Makefile: ssh-pull.o depends on ssh-fetch.c
log and diff family: honor config even from subdirectories
git-reset: detect update-ref error and report it.
lost-found: use fsck-objects --full
Teach git-http-fetch the --stdin switch
Teach git-local-fetch the --stdin switch
Make pull() support fetching multiple targets at once
...
Diffstat (limited to 'git-instaweb.sh')
| -rwxr-xr-x | git-instaweb.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh index 63b18b99f6..16cd351f7f 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -54,6 +54,10 @@ start_httpd () { fi done fi + if test $? != 0; then + echo "Could not execute http daemon $httpd." + exit 1 + fi } stop_httpd () { @@ -183,8 +187,10 @@ PerlPassEnv GIT_EXEC_DIR EOF else # plain-old CGI + list_mods=`echo "$httpd" | sed "s/-f$/-l/"` + $list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \ + echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf" cat >> "$conf" <<EOF -LoadModule cgi_module $module_path/mod_cgi.so AddHandler cgi-script .cgi <Location /gitweb.cgi> Options +ExecCGI @@ -232,4 +238,5 @@ esac start_httpd test -z "$browser" && browser=echo -$browser http://127.0.0.1:$port +url=http://127.0.0.1:$port +$browser $url || echo $url |