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

Re: Segfault with merge-tree on multiple Git versions

From
Charlie Smurthwaite <charlie@atechmedia.com>
Date
Mar 27, 2013, 17:52 UTC
Message-ID
<515331F2.3060703@atechmedia.com>
In-Reply-To
<7vsj3gn55b.fsf@alter.siamese.dyndns.org>
On 27/03/13 17:06, Junio C Hamano wrote:
Show 17 quoted lines
> Charlie Smurthwaite <charlie@atechmedia.com> writes:
>
>> I am experiencing a segmentation fault in various versions of Git using
>> different repositories.
>> ...
>> Test Command
>> git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f
>> 8d6bdf012941d876b2279994e02f1bb0d5c26e7d
>> d5ef97ac407d945f231cd7c8fb1cfe48b3a12083
> Thanks for a report (and thanks to John and Thomas for finding the
> typo).
>
> Nobody I know uses merge-tree; the last real change we did was back
> from July 2010, and the only reason I was looking at it recently was
> because I was planning to write a new merge strategy using it.
>
> Mind if I ask what you are using it for?

I am also using this to obtain a diff that would be applied if a merge were to be run. Is there a better way to obtain this information that is more commonly used?

Previous: Charlie SmurthwaiteNext: Jed Brown
Message 8 of 15 in “Segfault with merge-tree on multiple Git versions”
  1. Charlie SmurthwaiteMar 27, 2013
  2. thomasMar 27, 2013
  3. John KeepingMar 27, 2013
  4. Thomas RastMar 27, 2013
  5. Junio C HamanoMar 27, 2013
  6. Junio C HamanoMar 27, 2013
  7. Charlie SmurthwaiteMar 27, 2013
  8. Charlie SmurthwaiteMar 27, 2013
  9. Jed BrownMar 27, 2013
  10. Charlie SmurthwaiteMar 27, 2013
  11. Jed BrownMar 27, 2013
  12. John KeepingMar 27, 2013
  13. Jeff KingMar 27, 2013
  14. Charlie SmurthwaiteMar 27, 2013
  15. Junio C HamanoMar 27, 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.