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

Segfault in git merge-tree (1.8.2.2)

From
Andreas Jacobsen <andreas@andreasjacobsen.com>
Date
May 6, 2013, 13:02 UTC
Message-ID
<CADEJa-5prhhY-fUHgkk91M8HKWRG3enODS_h7Mq0dgo7V9sYsQ@mail.gmail.com>
Hi,

I'm getting a segfault in git merge-tree using v1.8.2.2 on MacOS 10.8.3. I can't share the repo, but I can build patches and check if they fix the problem :)

Here's a bt:

(gdb) run Starting program: /usr/local/Cellar/git/1.8.2.2/libexec/git-core/git-merge-tree 027058e6ac8d03e029c4e1455bf90f63cd20e65b FETCH_HEAD master Reading symbols for shared libraries +++++.............................. done

Program received signal EXC_BAD_ACCESS, Could not access memory.
Reason: KERN_INVALID_ADDRESS at address: 0x0000000000000000
0x000000010003e532 in threeway_callback ()
(gdb) bt
#0  0x000000010003e532 in threeway_callback ()
#1  0x00000001000da03b in traverse_trees ()
#2  0x000000010003e46b in threeway_callback ()
#3  0x00000001000da03b in traverse_trees ()
#4  0x000000010003e46b in threeway_callback ()
#5  0x00000001000da03b in traverse_trees ()
#6  0x000000010003e46b in threeway_callback ()
#7  0x00000001000da03b in traverse_trees ()
#8  0x000000010003e46b in threeway_callback ()
#9  0x00000001000da03b in traverse_trees ()
#10 0x000000010003e46b in threeway_callback ()
#11 0x00000001000da03b in traverse_trees ()
#12 0x000000010003e46b in threeway_callback ()
#13 0x00000001000da03b in traverse_trees ()
#14 0x000000010003e46b in threeway_callback ()
#15 0x00000001000da03b in traverse_trees ()
#16 0x000000010003e46b in threeway_callback ()
#17 0x00000001000da03b in traverse_trees ()
#18 0x000000010003e46b in threeway_callback ()
#19 0x00000001000da03b in traverse_trees ()
#20 0x000000010003e46b in threeway_callback ()
#21 0x00000001000da03b in traverse_trees ()
#22 0x000000010003e46b in threeway_callback ()
#23 0x00000001000da03b in traverse_trees ()
#24 0x000000010003df02 in cmd_merge_tree ()
#25 0x0000000100000e99 in handle_internal_command ()
#26 0x0000000100000c59 in main ()
-Andreas
Next: John Keeping
Message 1 of 8 in “Segfault in git merge-tree (1.8.2.2)”
  1. Andreas JacobsenMay 6, 2013
  2. John KeepingMay 6, 2013
  3. Andreas JacobsenMay 6, 2013
  4. John KeepingMay 6, 2013
  5. John KeepingMay 6, 2013
  6. merge-tree: handle directory/empty conflict correctlyJohn Keeping, May 6, 2013
  7. Andreas JacobsenMay 7, 2013
  8. Junio C HamanoMay 7, 2013

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.