git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 0/11] Misc. pull/merge/am improvements

From
Shawn Pearce <spearce@spearce.org>
Date
Dec 31, 2006, 01:21 UTC
Message-ID
<20061231012115.GA5082@spearce.org>
In-Reply-To
<7vmz57p6tn.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano <junkio@cox.net> wrote:
Show 10 quoted lines
> > 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.
Previous: Junio C HamanoNext: Junio C Hamano
Message 7 of 10 in “Misc. pull/merge/am improvements”
  1. 0/11 Misc. pull/merge/am improvementsShawn Pearce, Dec 28, 2006
  2. Junio C HamanoDec 28, 2006
  3. Shawn PearceDec 28, 2006
  4. Junio C HamanoDec 28, 2006
  5. Shawn PearceDec 29, 2006
  6. Junio C HamanoDec 29, 2006
  7. Shawn PearceDec 31, 2006
  8. Junio C HamanoDec 30, 2006
  9. Johannes SchindelinDec 29, 2006
  10. Junio C HamanoDec 29, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.