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

Re: git-merge-recursive segmentation error

From
Shawn Pearce <spearce@spearce.org>
Date
Dec 20, 2006, 02:43 UTC
Message-ID
<20061220024317.GA27918@spearce.org>
In-Reply-To
<655753.13323.qm@web31812.mail.mud.yahoo.com>
Luben Tuikov <ltuikov@yahoo.com> wrote:
Show 9 quoted lines
> > Junio C Hamano <junkio@cox.net> writes:
> > 1510fe is buggy and it is my fault.
> > 
> > For now, this _should_ get you keep going.
> > 
> > However, if this fixes it for you, that means we would still
> > have the problem on Cygwin X-<.
> 
> Yep -- that fixed it.
It might be a problem on Cygwin.  :-)

I completely fail to see how this patch would cause a segfault downstream in xdl_merge. All this controls is do we mmap data from the working directory or decompress it from the ODB. Either way we should have loaded the file size or content into the diff_filespec.

My other related change (7da41f48c) in this area has a better chance of causing a problem as it may be bypassing loading the file content into the diff_filespec where before we were always loading it. However none of my testing ever showed that would cause a problem.

Previous: Luben TuikovNext: Junio C Hamano
Message 5 of 6 in “Re: git-merge-recursive segmentation error”
  1. Junio C HamanoDec 20, 2006
  2. Junio C HamanoDec 20, 2006
  3. Johannes SchindelinDec 20, 2006
  4. Luben TuikovDec 20, 2006
  5. Shawn PearceDec 20, 2006
  6. Junio C HamanoDec 20, 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.