From: "Dana How" <danahow@gmail.com>
To: "Nicolas Pitre" <nico@cam.org>
Cc: "Junio C Hamano" <junkio@cox.net>,
git@vger.kernel.org, danahow@gmail.com
Subject: Re: [PATCH] fix repack with --max-pack-size
Date: Thu, 31 May 2007 17:01:38 -0700 [thread overview]
Message-ID: <56b7f5510705311701i7f76f06cq82617f0cd1dfc562@mail.gmail.com> (raw)
In-Reply-To: <alpine.LFD.0.99.0705302114430.11491@xanadu.home>
On 5/30/07, Nicolas Pitre <nico@cam.org> wrote:
> Two issues here:
>
> 1) git-repack -a --max-pack-size=10 on the GIT repo dies pretty quick.
> There is a lot of confusion about deltas that were suposed to be
> reused from another pack but that get stored undeltified due to pack
> limit and object size doesn't match entry->size anymore. This test
> is not really worth the complexity for determining when it is valid
> so get rid of it.
This is very real. A smaller fix would have been the hunk
@@ -408,7 +407,7 @@ static unsigned long write_object(struct sha1file *f,
> buf = read_sha1_file(entry->sha1, &type, &size);
> if (!buf)
> die("unable to read %s", sha1_to_hex(entry->sha1));
>- if (size != entry->size)
>+ if (size != entry->size && type == obj_type)
> die("object %s size inconsistency (%lu vs %lu)",
> sha1_to_hex(entry->sha1), size, entry->size);
> if (usable_delta) {
from the max-blob-size patch that hasn't converged yet.
Both pack splitting and blob-size limiting could cause a delta base
not to appear in the pack containing a delta using the base.
Then you get the size mismatch Nicolas discussed
when the real object must be used and its size doesn't match
the delta sized stored in the size field.
I first saw this with max-blob-size, but only realized recently
that it also applied to max-pack-size. Sorry I didn't post a patch;
we are swamped at the moment.
ACK [but I didn't review (2)].
Thanks,
--
Dana L. How danahow@gmail.com +1 650 804 5991 cell
prev parent reply other threads:[~2007-06-01 0:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-31 1:43 [PATCH] fix repack with --max-pack-size Nicolas Pitre
2007-06-01 0:01 ` Dana How [this message]
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=56b7f5510705311701i7f76f06cq82617f0cd1dfc562@mail.gmail.com \
--to=danahow@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=nico@cam.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).