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 <junkio@cox.net> --- Here is what I did. I unoptimized your original and that sits near the tip of "pu" branch. This patch is to revert the unoptimization. In addition, git-prune is told about the empty fan-out removal, although it may not matter that much. Hopefully, the phase I can be included in the next official release, and after everybody updates, this patch can go in. git-prune.sh | 1 + init-db.c | 4 ---- prune-packed.c | 3 +-- t/t0000-basic.sh | 8 ++++---- 4 files changed, 6 insertions(+), 10 deletions(-) applies-to: d672cb30d513553ea3ca92a933563a25df1d7865 93638ce0a569543d0b41eedfac6873a541f5c753 diff --git a/git-prune.sh b/git-prune.sh index 9657dbf..b28630c 100755 --- 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 index aabc09f..921df9b 100644 --- a/init-db.c +++ b/init-db.c @@ -244,10 +244,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 index 73f0f3a..16685d1 100644 --- a/prune-packed.c +++ b/prune-packed.c @@ -27,8 +27,7 @@ static void prune_dir(int i, DIR *dir, c 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 index 5c5f854..dff7d69 100755 --- 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 --- 0.99.8.GIT - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sat Oct 08 02:31:23 2005
This archive was generated by hypermail 2.1.8 : 2005-10-08 02:31:27 EST