diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-24 06:54:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-24 06:54:39 +0100 |
| commit | 75a7ea258c0644b79e57cab3a345807f4017dfd2 (patch) | |
| tree | 0d55ddcfcbf550dc552a55c9ce15847d1c17114d /git-instaweb.sh | |
| parent | remote-curl.c: fix rpc_out() (diff) | |
| parent | pack-objects: split implications of --all-progress from progress activation (diff) | |
| download | git-75a7ea258c0644b79e57cab3a345807f4017dfd2.tar.xz git-75a7ea258c0644b79e57cab3a345807f4017dfd2.zip | |
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-x | git-instaweb.sh | 5 |
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 |