Re: git merging

[Jeff Garzik <jgarzik@pobox.com>]

Linus Torvalds wrote:
> The "git prune" script is really trivial, you can see for yourself what 
> "git-prune-script" does.


I've been too lazy to report this, but...

last time I tried it, git-prune-script ate valid objects, for my 
multi-branch trees.  This was 100% reproducible.  Luckily, the objects 
it ate were all in the main branch, so an rsync-without-delete from 
linux-2.6.git/objects would restore the missing data.

This was verified by repeated runs of
	git-fsck-cache		# OK
	git-prune-script
	git-fsck-cache		# spits out tons of errors
	rsync ...		# restore deleted objects
	git-fsck-cache		# OK

I use hardlinks on the local disk, between several multi-branch repos, 
if that matters.

	Jeff