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

diff --cc builtin-pack-objects.c
index 4c91e944c21df3d5e02535115cdd6098ee49d86d,7938202170c1d6110a798da8d58f64ba0c4b4f70..4429d53a1e82b81f0a82e34bf2d6ae463aeeadee
--- 1/builtin-pack-objects.c
--- 2/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@@ -2326,6 -2330,14 +2332,9 @@@ int cmd_pack_objects(int argc, const ch
        if (keep_unreachable && unpack_unreachable)
                die("--keep-unreachable and --unpack-unreachable are incompatible.");
  
 -#ifdef THREADED_DELTA_SEARCH
 -      if (!delta_search_threads)      /* --threads=0 means autodetect */
 -              delta_search_threads = online_cpus();
 -#endif
 -
+       if (progress && all_progress_implied)
+               progress = 2;
+ 
        prepare_packed_git();
  
        if (progress)

diff --cc builtin-send-pack.c
Simple merge

diff --cc git-instaweb.sh
Simple merge