From 3254d218b4f9ef1550d1d83670fad8f455b08578 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 20 Mar 2007 23:32:13 -0400 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- builtin-prune.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin-prune.c b/builtin-prune.c index 09864b7a6d..44df59e4a7 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; } -- 2.11.4.GIT