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

git merge-tree segfault

From
KLKlas Lindberg <klas.lindberg@gmail.com>
Date
Oct 28, 2010, 20:16 UTC
Message-ID
<AANLkTinJQCqwRZpbO66VHrgxezedS1Ay3nr9kayiODi9@mail.gmail.com>

I haven't tried this on newer versions of git, but the release notes for later releases don't mention merge-tree anywhere, so...

git version: 1.7.0 uname -a: Linux tor 2.6.32-trunk-amd64 #1 SMP Sun Jan 10 22:40:40 UTC 2010 x86_64 GNU/Linux distro: Debian GNU/Linux squeeze/sid

Unpack the attached tree, cd into it and run: git merge-tree common master other

I get the following result:
added in local
  our    100644 d68dd4031d2ad5b7a3829ad7df6635e27a7daa22 t1.txt
Segmentation fault

The exit code: 139

BR / Klas
Next: Tim Mazid
Message 1 of 6 in “git merge-tree segfault”
  1. Klas LindbergOct 28, 2010
  2. Tim MazidOct 28, 2010
  3. Klas LindbergOct 30, 2010
  4. Ævar Arnfjörð BjarmasonOct 30, 2010
  5. Mathias LafeldtOct 30, 2010
  6. Klas LindbergOct 30, 2010

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.