From: Nicolas Pitre <nico@cam.org>
Date: Wed, 21 Mar 2007 03:32:13 +0000 (-0400)
Subject: minor git-prune optimization
X-Git-Tag: v1.5.1-rc2~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3254d218b4f9ef1550d1d83670fad8f455b08578;p=git.git

minor git-prune optimization

Don't try to remove the containing directory for every pruned object but
try only once after the directory has been scanned instead.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-prune.c b/builtin-prune.c
index 09864b7a6..44df59e4a 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -14,10 +14,8 @@ static int prune_object(char *path, const char *filename, const unsigned char *s
 		enum object_type type = sha1_object_info(sha1, NULL);
 		printf("%s %s\n", sha1_to_hex(sha1),
 		       (type > 0) ? typename(type) : "unknown");
-		return 0;
-	}
-	unlink(mkpath("%s/%s", path, filename));
-	rmdir(path);
+	} else
+		unlink(mkpath("%s/%s", path, filename));
 	return 0;
 }
 
@@ -60,6 +58,8 @@ static int prune_dir(int i, char *path)
 		}
 		fprintf(stderr, "bad sha1 file: %s/%s\n", path, de->d_name);
 	}
+	if (!show_only)
+		rmdir(path);
 	closedir(dir);
 	return 0;
 }