undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

return the prune-packed progress display to the inner loop

Browse Source 
This reverts commit 0e54913796 so to return
to the same state as commit b5d72f0a4c.

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>
This commit is contained in:
Nicolas Pitre 2007-11-01 16:59:55 -04:00 committed by Junio C Hamano
parent 2a128d63dc
commit 93ff3f6a53
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-prune-packed.c
View File

@ -15,8 +15,6 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
struct dirent *de; struct dirent *de;
char hex[40]; char hex[40];
display_progress(progress, i + 1);
sprintf(hex, "%02x", i); sprintf(hex, "%02x", i);
while ((de = readdir(dir)) != NULL) { while ((de = readdir(dir)) != NULL) {
unsigned char sha1[20]; 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); printf("rm -f %s\n", pathname);
else if (unlink(pathname) < 0) else if (unlink(pathname) < 0)
error("unable to unlink %s", pathname); error("unable to unlink %s", pathname);
display_progress(progress, i + 1);
} }
pathname[len] = 0; pathname[len] = 0;
rmdir(pathname); rmdir(pathname);