Create object subdirectories on demand (phase II)

Linus Torvalds · Junio C Hamano · commit 9106c097ad87 · 2005-10-28T02:01:42.000-07:00
This removes the unoptimization.  The previous round does not mind
missing fan-out directories, but still makes sure they exist, lest
older versions choke on a repository created/packed by it.

This round does not play that nicely anymore -- empty fan-out
directories are not created by init-db, and will stay removed by
prune-packed.  The prune command also removes empty fan-out directories.

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/git-prune.sh b/git-prune.sh
@@ -22,6 +22,7 @@ sed -ne '/unreachable /{
 }' | {
 	cd "$GIT_OBJECT_DIRECTORY" || exit
 	xargs $echo rm -f
+	rmdir 2>/dev/null [0-9a-f][0-9a-f]
 }
 
 git-prune-packed $dryrun
diff --git a/init-db.c b/init-db.c
@@ -281,10 +281,6 @@ int main(int argc, char **argv)
 	memcpy(path, sha1_dir, len);
 
 	safe_create_dir(sha1_dir);
-	for (i = 0; i < 256; i++) {
-		sprintf(path+len, "/%02x", i);
-		safe_create_dir(path);
-	}
 	strcpy(path+len, "/pack");
 	safe_create_dir(path);
 	strcpy(path+len, "/info");
diff --git a/prune-packed.c b/prune-packed.c
@@ -27,8 +27,7 @@ static void prune_dir(int i, DIR *dir, char *pathname, int len)
 			error("unable to unlink %s", pathname);
 	}
 	pathname[len] = 0;
-	if (!rmdir(pathname))
-		mkdir(pathname, 0777);
+	rmdir(pathname);
 }
 
 static void prune_packed_objects(void)
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
@@ -28,12 +28,12 @@ test_expect_success \
     '.git/objects should be empty after git-init-db in an empty repo.' \
     'cmp -s /dev/null should-be-empty' 
 
-# also it should have 258 subdirectories; 256 fan-out anymore, pack, and info.
-# 259 is counting "objects" itself
+# also it should have 2 subdirectories; no fan-out anymore, pack, and info.
+# 3 is counting "objects" itself
 find .git/objects -type d -print >full-of-directories
 test_expect_success \
-    '.git/objects should have 258 subdirectories.' \
-    'test $(wc -l < full-of-directories) = 259'
+    '.git/objects should have 3 subdirectories.' \
+    'test $(wc -l < full-of-directories) = 3'
 
 ################################################################
 # Basics of the basics

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ sed -ne '/unreachable /{`
`22`	`22`	`}' \| {`
`23`	`23`	`cd "$GIT_OBJECT_DIRECTORY" \|\| exit`
`24`	`24`	`xargs $echo rm -f`
	`25`	`+ rmdir 2>/dev/null [0-9a-f][0-9a-f]`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`git-prune-packed $dryrun`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ static void prune_dir(int i, DIR dir, char pathname, int len)`
`27`	`27`	`error("unable to unlink %s", pathname);`
`28`	`28`	`}`
`29`	`29`	`pathname[len] = 0;`
`30`		`- if (!rmdir(pathname))`
`31`		`- mkdir(pathname, 0777);`
	`30`	`+ rmdir(pathname);`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`static void prune_packed_objects(void)`