@matheusbsbs / matheus-bagliano / commits / 93ff3f6a53
Fork 0

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>

Nicolas Pitre committed Nov 1, 2007 at 16:59 UTC 93ff3f6a5311ebb6347b817d1c57c94dbbe4de73
1 file changed +1 -2
builtin-prune-packed.c
+1 -2
@@ -15,8 +15,6 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
15 struct dirent *de;
16 char hex[40];
17
18 - display_progress(progress, i + 1);
19 -
18 sprintf(hex, "%02x", i);
19 while ((de = readdir(dir)) != NULL) {
20 unsigned char sha1[20];
@@ -32,6 +30,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
30 printf("rm -f %s\n", pathname);
31 else if (unlink(pathname) < 0)
32 error("unable to unlink %s", pathname);
33 + display_progress(progress, i + 1);
34 }
35 pathname[len] = 0;
36 rmdir(pathname);