From 9106c097ad87577019544f45fda11c4d73986597 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 9 Oct 2005 02:30:17 -0700 Subject: Create object subdirectories on demand (phase II) 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 --- git-prune.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'git-prune.sh') diff --git a/git-prune.sh b/git-prune.sh index 9657dbf271..b28630cacf 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 -- cgit v1.3-5-g9baa From 41f222e87a9062833712367d66114cae90b3769a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 28 Oct 2005 09:45:53 -0700 Subject: Be marginally more careful about removing objects The git philosophy when it comes to disk accesses is "Laugh in the face of danger". Notably, since we never modify an existing object, we don't really care that deeply about flushing things to disk, since even if the machine crashes in the middle of a git operation, you can never really have lost any old work. At most, you'd need to figure out the proper heads (which git-fsck-objects can do for you) and re-do the operation. However, there's two exceptions to this: pruning and repacking. Those operations will actually _delete_ old objects that they know about in other ways (ie that they just repacked, or that they have found in other places). However, since they actually modify old state, we should thus be a bit more careful about them. If the machine crashes and the duplicate new objects haven't been flushed to disk, you can actually be in trouble. This is trivially stupid about it by calling "sync" before removing the objects. Not very smart, but we're talking about special operations than are usually done once a week if that. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- git-prune.sh | 1 + git-repack.sh | 1 + prune-packed.c | 1 + 3 files changed, 3 insertions(+) (limited to 'git-prune.sh') diff --git a/git-prune.sh b/git-prune.sh index b28630cacf..ef31bd2a68 100755 --- a/git-prune.sh +++ b/git-prune.sh @@ -15,6 +15,7 @@ do shift; done +sync git-fsck-objects --full --cache --unreachable "$@" | sed -ne '/unreachable /{ s/unreachable [^ ][^ ]* // diff --git a/git-repack.sh b/git-repack.sh index 49547a77c7..d341966efb 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -62,6 +62,7 @@ then # all-into-one is used. if test "$all_into_one" != '' && test "$existing" != '' then + sync ( cd "$PACKDIR" && for e in $existing do diff --git a/prune-packed.c b/prune-packed.c index 16685d1d8b..26123f7f6b 100644 --- a/prune-packed.c +++ b/prune-packed.c @@ -71,6 +71,7 @@ int main(int argc, char **argv) /* Handle arguments here .. */ usage(prune_packed_usage); } + sync(); prune_packed_objects(); return 0; } -- cgit v1.3-5-g9baa