summaryrefslogtreecommitdiff
path: root/git-instaweb.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-23 21:54:39 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-23 21:54:39 -0800
commit75a7ea258c0644b79e57cab3a345807f4017dfd2 (patch)
tree0d55ddcfcbf550dc552a55c9ce15847d1c17114d /git-instaweb.sh
parent483106089aea7ad856b7f940e20db254b08bad81 (diff)
parent4f366275189c06ec26c01ee5ace2f3831b2aa46a (diff)
downloadgit-75a7ea258c0644b79e57cab3a345807f4017dfd2.tar.gz
Merge branch 'maint'
* maint: pack-objects: split implications of --all-progress from progress activation instaweb: restart server if already running prune-packed: only show progress when stderr is a tty Conflicts: builtin-pack-objects.c
Diffstat (limited to 'git-instaweb.sh')
-rwxr-xr-xgit-instaweb.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 622a5f0eb2..ffc2ab62bc 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -73,6 +73,11 @@ resolve_full_httpd () {
}
start_httpd () {
+ if test -f "$fqgitdir/pid"; then
+ say "Instance already running. Restarting..."
+ stop_httpd
+ fi
+
# here $httpd should have a meaningful value
resolve_full_httpd