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

Re: [PATCH] Fix segfault in merge-recursive

From
Dave O <cxreg@pobox.com>
Date
May 8, 2009, 21:41 UTC
Message-ID
<alpine.DEB.2.00.0905081436070.30999@narbuckle.genericorp.net>
In-Reply-To
<alpine.DEB.1.00.0905082229520.4601@intel-tinevez-2-302>
On Fri, 8 May 2009, Johannes Schindelin wrote:
Show 5 quoted lines
>
> When there is no "common" tree (for whatever reason), we must not
> throw a segmentation fault.
>
> Noticed by Dave O.

While this patch does prevent a segfault, it totally fails to recognize any conflicts in the merge. Reverting 36e3b5e produces an ordinary merge conflict with some rename/delete conflicts, and others including content related conflicts. I'm not sure I wouldn't rather have the segfault than the grossly incorrect automerge.

I'll continue debugging the triggering condition to see if I can understand why the index is left dirty, leading to this NULL tree.

Thanks!
     Dave
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 5 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.