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

Re: [PATCH] Don't update index while recursing (was Re: Segfault during merge)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 9, 2009, 07:57 UTC
Message-ID
<alpine.DEB.1.00.0905090954520.27348@pacific.mpi-cbg.de>
In-Reply-To
<alpine.DEB.2.00.0905082224450.30999@narbuckle.genericorp.net>
Hi,
On Fri, 8 May 2009, Dave O wrote:
Show 10 quoted lines
> On Fri, 8 May 2009, Dave O wrote:
> 
> > Once again, I don't really know what the implications of the index 
> > operations that are happening here are, but the update_stages() call 
> > in a recursive merge must be doing surprising.
> 
> After writing this, I took another look around merge-recursive.c, and 
> realized that all the calls to update_stages() except this one were 
> careful only to do it when o->call_depth was 0.  This simple patch seems 
> to fully rectify the problem.
ACK.

Could you provide a commit message saying that call_depth > 0 requires trees to be constructed from the files with conflicts and that the stages thusly must not be updated?

Oh, and you may want to adjust the test I made from your script (you said you made it shorter, but you made the original version shorter, which does not run in the test suite unmodified).

And then a Signed-off-by, and you're good to go!
Sorry for my lousy attempt to help...

Ciao, Dscho

Previous: Dave ONext: Junio C Hamano
Message 9 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.