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

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

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 16, 2007, 04:05 UTC
Message-ID
<Pine.LNX.4.63.0702160503290.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<7v3b56dhr1.fsf@assigned-by-dhcp.cox.net>
Hi,
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.

Ciao, Dscho

Previous: Junio C HamanoNext: Shawn O. Pearce
Message 2 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.