Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 05:54:39 +0000 (21:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Nov 2009 05:54:39 +0000 (21:54 -0800)
* 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

1  2 
builtin-pack-objects.c
builtin-send-pack.c
git-instaweb.sh

@@@ -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)
Simple merge
diff --cc git-instaweb.sh
Simple merge