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

Re: [BUG] seemingly-rare segfault in merge-tree

From
Taylor Blau <me@ttaylorr.com>
Date
Sep 20, 2022, 20:59 UTC
Message-ID
<YyopmKNZU4WL2wrV@nand.local>
In-Reply-To
<YyopQD+LvPucnz3w@nand.local>
On Tue, Sep 20, 2022 at 04:57:36PM -0400, Taylor Blau wrote:
>   #1  0x000056234188aba3 in real_merge (prefix=0x0, branch2=<optimized out>,
>       branch1=<optimized out>, o=0x7ffd3fc4cd60) at builtin/merge-tree.c:528
>   528	builtin/merge-tree.c: No such file or directory.

I should mention, of course, that this line is custom to GitHub's fork, and so doesn't match with the latest on `master`. Here's a link to the relevant call that matches up:

  https://github.com/git/git/blob/dda7228a83e2e9ff584bf6adbf55910565b41e14/builtin/merge-tree.c#L449

Thanks, Taylor

Previous: Taylor BlauNext: Johannes Schindelin
Message 2 of 4 in “[BUG] seemingly-rare segfault in merge-tree”
  1. Taylor BlauSep 20, 2022
  2. Taylor BlauSep 20, 2022
  3. Johannes SchindelinSep 20, 2022
  4. Taylor BlauSep 20, 2022

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.