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

Re: git-merge-recursive segmentation error

From
LTLuben Tuikov <ltuikov@yahoo.com>
Date
Dec 20, 2006, 02:18 UTC
Message-ID
<427701.7195.qm@web31811.mail.mud.yahoo.com>
In-Reply-To
<Pine.LNX.4.63.0612200217300.19693@wbgn013.biozentrum.uni-wuerzburg.de>
--- Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 10 quoted lines
> Hi,
> 
> On Tue, 19 Dec 2006, Luben Tuikov wrote:
> 
> > Auto-merging init/version.c
> > /home/luben/bin/git-merge: line 394: 12030 
> > Segmentation fault git-merge-$strategy $common -- "$head_arg" "$@"
> 
> Do you have any pointers how to get the two branches you try to merge? I'd 
> be most grateful to have the sha1's of both heads, too...

The source tree is Linus' "master" tree. The destination tree is my own "dev" tree, which I use as an intermediate tree, before merging into my own kernel trees.

Hopefully with the backtrace I posted and with the big-bisect results pointing to the culprit commit, someone can get a patch out to fix this.

    Luben
Next: Johannes Schindelin
Message 1 of 2 in “Re: git-merge-recursive segmentation error”
  1. Luben TuikovDec 20, 2006
  2. Johannes SchindelinDec 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.