git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] minor git-prune optimization
@ 2007-03-21  3:32 Nicolas Pitre
  0 siblings, 0 replies; only message in thread
From: Nicolas Pitre @ 2007-03-21  3:32 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

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>
---

diff --git a/builtin-prune.c b/builtin-prune.c
index 09864b7..44df59e 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;
 }

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2007-03-21  3:32 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-21  3:32 [PATCH] minor git-prune optimization Nicolas Pitre

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).