diff options
author | Nicolas Pitre <nico@cam.org> | 2007-03-20 23:32:13 -0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-20 22:17:47 -0700 |
commit | 3254d218b4f9ef1550d1d83670fad8f455b08578 (patch) | |
tree | 998393b444bb7f9100bc163dd42021a7634f20f7 /builtin-prune.c | |
parent | 57216856999babf6f90235cf6c41dfcef98a3dab (diff) | |
download | git-3254d218b4f9ef1550d1d83670fad8f455b08578.tar.gz |
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>
Diffstat (limited to 'builtin-prune.c')
-rw-r--r-- | builtin-prune.c | 8 |
1 files 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; } |