From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Nov 2009 05:54:39 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc1~41
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75a7ea258c0644b79e57cab3a345807f4017dfd2;p=git.git

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
---

75a7ea258c0644b79e57cab3a345807f4017dfd2
diff --cc builtin-pack-objects.c
index 4c91e944c,793820217..4429d53a1
--- a/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)