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

Re: Segfault during merge

From
Dave O <cxreg@pobox.com>
Date
May 8, 2009, 04:37 UTC
Message-ID
<alpine.DEB.2.00.0905072131470.30999@narbuckle.genericorp.net>
In-Reply-To
<alpine.DEB.1.00.0905071144370.18521@pacific.mpi-cbg.de>
On Thu, 7 May 2009, Johannes Schindelin wrote:
Show 5 quoted lines
>> Hi, I've encountered a particular merge that causes a segfault, and was
>> able to successfully bisect git to commit 36e3b5e.
>
> As you already found the commit, you could have Cc:ed me already.  It is
> pure luck that I did not miss your bug report.
Sorry, didn't think to do so.

After some thought, I was able to come up with a simple script that reproduces this crash. I'm not sure what the policy on this list is for attachments, so I've put it at this URL:

http://www.genericorp.net/~count/git-merge-crash

It requires bash and the perl /usr/bin/rename command for simplicity's sake. At the top of the script is a diagram of what it does.

Hopefully this helps you identify what's happening here. Let me know if I can help further.

     Dave
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 3 of 13 in “Segfault during merge”
  1. Dave OMay 7, 2009
  2. Johannes SchindelinMay 7, 2009
  3. Dave OMay 8, 2009
  4. Fix segfault in merge-recursiveJohannes Schindelin, May 8, 2009
  5. Dave OMay 8, 2009
  6. Johannes SchindelinMay 8, 2009
  7. Dave OMay 8, 2009
  8. Don't update index while recursing (was Re: Segfault during merge)Dave O, May 9, 2009
  9. Johannes SchindelinMay 9, 2009
  10. Junio C HamanoMay 9, 2009
  11. Junio C HamanoMay 8, 2009
  12. Johannes SchindelinMay 9, 2009
  13. Jakub NarebskiMay 7, 2009

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.