From: Junio C Hamano <junkio@cox.net>
Date: Thu, 23 Feb 2006 11:00:59 +0000 (-0800)
Subject: Merge part of pack-thin branch
X-Git-Tag: v1.3.0-rc1~54^2~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=207a1f3ce9894ad6fab59077b9cec1adc70ed6c5;p=git.git

Merge part of pack-thin branch
---

207a1f3ce9894ad6fab59077b9cec1adc70ed6c5
diff --cc pack-objects.c
index 32befa002,af3bdf5d3..8da8aabf9
--- a/pack-objects.c
+++ b/pack-objects.c
@@@ -516,12 -493,9 +516,13 @@@ static int add_object_entry(const unsig
  			die("internal error in object hashing.");
  		object_ix[-1 - ix] = idx + 1;
  	}
+ 	status = 1;
  
   already_added:
 +	if (progress_update) {
 +		fprintf(stderr, "Counting objects...%d\r", nr_objects);
 +		progress_update = 0;
 +	}
  	if (exclude)
  		entry->preferred_base = 1;
  	else {