path: root/prune-packed.c
diff options
authorLinus Torvalds <>2005-10-08 22:54:01 (GMT)
committerJunio C Hamano <>2005-10-08 22:54:01 (GMT)
commit230f13225df8b7e7eb0acc91a8c630f9e84967c1 (patch)
treec56ceaea7e1d17816c2cefb8cb26bb22fa22bd0b /prune-packed.c
parent0d0b7c237af0846123bef73879d65a3e78a56461 (diff)
Create object subdirectories on demand
This makes it possible to have a "sparse" git object subdirectory structure, something that has become much more attractive now that people use pack-files all the time. As a result of pack-files, a git object directory doesn't necessarily have any individual objects lying around, and in that case it's just wasting space to keep the empty first-level object directories around: on many filesystems the 256 empty directories will be aboue 1MB of diskspace. Even more importantly, after you re-pack a project that _used_ to be unpacked, you could be left with huge directories that no longer contain anything, but that waste space and take time to look through. With this change, "git prune-packed" can just do an rmdir() on the directories, and they'll get removed if empty, and re-created on demand. This patch also tries to fix up "write_sha1_from_fd()" to use the new common infrastructure for creating the object files, closing a hole where we might otherwise leave half-written objects in the object database. [jc: I unoptimized the part that really removes the fan-out directories to ease transition. init-db still wastes 1MB of diskspace to hold 256 empty fan-outs, and prune-packed rmdir()'s the grown but empty directories, but runs mkdir() immediately after that -- reducing the saving from 150KB to 146KB. These parts will be re-introduced when everybody has the on-demand capability.] Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'prune-packed.c')
1 files changed, 4 insertions, 1 deletions
diff --git a/prune-packed.c b/prune-packed.c
index 5306e8e..73f0f3a 100644
--- a/prune-packed.c
+++ b/prune-packed.c
@@ -26,6 +26,9 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len)
else if (unlink(pathname) < 0)
error("unable to unlink %s", pathname);
+ pathname[len] = 0;
+ if (rmdir(pathname))
+ mkdir(pathname, 0777);
static void prune_packed_objects(void)
@@ -46,7 +49,7 @@ static void prune_packed_objects(void)
sprintf(pathname + len, "%02x/", i);
d = opendir(pathname);
if (!d)
- die("unable to open %s", pathname);
+ continue;
prune_dir(i, d, pathname, len + 3);