From: Shawn Pearce <spearce@spearce.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 0/11] Misc. pull/merge/am improvements
Date: Sat, 30 Dec 2006 20:21:15 -0500 [thread overview]
Message-ID: <20061231012115.GA5082@spearce.org> (raw)
In-Reply-To: <7vmz57p6tn.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> wrote:
> > Junio C Hamano <junkio@cox.net> wrote:
> >> While I was looking at the problem, I noticed something a bit
> >> easier to reproduce and should be lot easier to diagnose. At
> >> http://userweb.kernel.org/~junio/broken.tar, I have a tarball of
> >> git.git repository.
> >
>
> I think there is a thinko in the OFS_DELTA arm of that switch
> statement. You are resetting buf to (in-pack-offset + used), so
> you should fetch the variably encoded length starting from buf[0].
Yes. Your patch looks correct; that's a really bad thinko on
my part. Thanks for tracking it down, and fixing it.
--
Shawn.
next prev parent reply other threads:[~2006-12-31 1:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-28 7:34 [PATCH 0/11] Misc. pull/merge/am improvements Shawn Pearce
2006-12-28 8:25 ` Junio C Hamano
2006-12-28 8:42 ` Shawn Pearce
2006-12-28 11:04 ` Junio C Hamano
2006-12-29 4:53 ` Shawn Pearce
2006-12-29 6:14 ` Junio C Hamano
2006-12-31 1:21 ` Shawn Pearce [this message]
2006-12-30 19:27 ` Junio C Hamano
2006-12-29 17:46 ` Johannes Schindelin
2006-12-29 17:53 ` Junio C Hamano
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=20061231012115.GA5082@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).