diff options
| author | Nicolas Pitre <nico@cam.org> | 2007-11-01 16:59:55 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-01 15:22:32 -0700 |
| commit | 93ff3f6a5311ebb6347b817d1c57c94dbbe4de73 (patch) | |
| tree | 301119efb934d1ba0c8dff6657e354f0f0f8cd28 | |
| parent | 2a128d63dc140e8daeaf68659d9263b7389b7d1b (diff) | |
| download | git-93ff3f6a5311ebb6347b817d1c57c94dbbe4de73.tar.gz | |
return the prune-packed progress display to the inner loop
This reverts commit 0e549137966feb016927a827fb6e359aec8264a3 so to return
to the same state as commit b5d72f0a4cd3cce945ca0d37e4fa0ebbfcdcdb52.
On Wed, 31 Oct 2007, Shawn O. Pearce wrote:
> During my testing with a 40,000 loose object case (yea, I fully
> unpacked a git.git clone I had laying around) my system stalled
> hard in the first object directory. A *lot* longer than 1 second.
> So I got no progress meter for a long time, and then a progress
> meter appeared on the second directory.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-prune-packed.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c index f4287dad10..23faf3129f 100644 --- a/builtin-prune-packed.c +++ b/builtin-prune-packed.c @@ -15,8 +15,6 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts) struct dirent *de; char hex[40]; - display_progress(progress, i + 1); - sprintf(hex, "%02x", i); while ((de = readdir(dir)) != NULL) { unsigned char sha1[20]; @@ -32,6 +30,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts) printf("rm -f %s\n", pathname); else if (unlink(pathname) < 0) error("unable to unlink %s", pathname); + display_progress(progress, i + 1); } pathname[len] = 0; rmdir(pathname); |