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

Re: [PATCH] pretend-sha1: grave bugfix.

From
Shawn O. Pearce <spearce@spearce.org>
Date
Feb 16, 2007, 05:09 UTC
Message-ID
<20070216050943.GD28894@spearce.org>
In-Reply-To
<Pine.LNX.4.63.0702160503290.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 8 quoted lines
> On Thu, 15 Feb 2007, Junio C Hamano wrote:
> 
> >  * I wonder how recent merge-recursive with multiple merge bases
> >    (or an empty one) ever worked with this bug.  Am I
> >    hallucinating?
> 
> Probably the fact helped that merge-recursive only pretends 
> zero-sized blobs.

Most definately. We never look at the pointer to an object's data if len == 0, which it does in this case of merge-recursive's empty tree.

Aren't we using this for git-blame --contents? How'd that ever work for a non-empty file?

-- 
Shawn.
Previous: Johannes SchindelinNext: Junio C Hamano
Message 3 of 4 in “pretend-sha1: grave bugfix.”
  1. pretend-sha1: grave bugfix.Junio C Hamano, Feb 16, 2007
  2. Johannes SchindelinFeb 16, 2007
  3. Shawn O. PearceFeb 16, 2007
  4. Junio C HamanoFeb 16, 2007

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.