From: Jeff Garzik <jgarzik@pobox.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Jens Axboe <axboe@suse.de>, Git Mailing List <git@vger.kernel.org>
Subject: Re: git merging
Date: Fri, 17 Jun 2005 19:08:07 -0400 [thread overview]
Message-ID: <42B357D7.6030302@pobox.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0506171142500.2268@ppc970.osdl.org>
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
next prev parent reply other threads:[~2005-06-17 23:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050617133440.GI6957@suse.de>
[not found] ` <Pine.LNX.4.58.0506170937260.8487@ppc970.osdl.org>
[not found] ` <20050617175653.GS6957@suse.de>
[not found] ` <Pine.LNX.4.58.0506171101450.2268@ppc970.osdl.org>
[not found] ` <20050617181156.GT6957@suse.de>
[not found] ` <Pine.LNX.4.58.0506171132390.2268@ppc970.osdl.org>
[not found] ` <20050617183914.GX6957@suse.de>
2005-06-17 18:50 ` git merging Linus Torvalds
2005-06-17 19:16 ` Jens Axboe
2005-06-17 23:08 ` Jeff Garzik [this message]
2005-06-17 23:31 ` Linus Torvalds
2005-06-17 23:51 ` Jeff Garzik
2005-06-18 0:13 ` Linus Torvalds
2005-06-20 12:30 ` Jens Axboe
2005-06-20 13:48 ` Matthias Urlichs
2005-06-20 14:13 ` Jens Axboe
2005-06-20 15:58 ` Linus Torvalds
2005-06-20 16:06 ` Daniel Barkalow
2005-06-20 19:21 ` Matthias Urlichs
2005-06-20 20:38 ` Jens Axboe
2005-06-20 21:15 ` Linus Torvalds
2005-06-21 14:59 ` Jens Axboe
2005-06-21 15:53 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=42B357D7.6030302@pobox.com \
--to=jgarzik@pobox.com \
--cc=axboe@suse.de \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).