From: Nicolas Pitre <nico@cam.org>
Date: Tue, 30 Oct 2007 18:57:31 +0000 (-0400)
Subject: prune-packed: don't call display_progress() for every file
X-Git-Tag: v1.5.4-rc0~286^2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e549137966feb016927a827fb6e359aec8264a3;p=git.git

prune-packed: don't call display_progress() for every file

The progress count is per fanout directory, so it is useless to call
it for every file as the count doesn't change that often.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index 015c8bb7c..907e36828 100644
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -15,6 +15,9 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
 	struct dirent *de;
 	char hex[40];
 
+	if (opts == VERBOSE)
+		display_progress(&progress, i + 1);
+
 	sprintf(hex, "%02x", i);
 	while ((de = readdir(dir)) != NULL) {
 		unsigned char sha1[20];
@@ -26,8 +29,6 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len, int opts)
 		if (!has_sha1_pack(sha1, NULL))
 			continue;
 		memcpy(pathname + len, de->d_name, 38);
-		if (opts == VERBOSE)
-			display_progress(&progress, i + 1);
 		if (opts & DRY_RUN)
 			printf("rm -f %s\n", pathname);
 		else if (unlink(pathname) < 0)