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

git-merge-recursive segmentation error

From
LTLuben Tuikov <ltuikov@yahoo.com>
Date
Dec 20, 2006, 01:00 UTC
Message-ID
<693577.67723.qm@web31813.mail.mud.yahoo.com>

So, I'm merging Linux master into my own dev tree and here is what I get in syslog:

Dec 19 16:56:38 lion kernel: [ 1704.395478] git-merge-recur[12030] general protection rip:4285ef rsp:7ffff727bf40 error:0

and on the command line: ... Auto-merging init/Kconfig Auto-merging init/version.c /home/luben/bin/git-merge: line 394: 12030 Segmentation fault git-merge-$strategy $common -- "$head_arg" "$@" Merge with strategy recursive failed.

I'm running "next".
Are the people aware of this issue?
It is 100% reproducible on my trees.
Anyone has a patch?
     Luben
Next: Johannes Schindelin
Message 1 of 2 in “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.