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

Re: [BUG] diffcore-rename with duplicate tree entries can segfault

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 24, 2015, 22:42 UTC
Message-ID
<xmqqh9uborrx.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20150224214311.GA8622@peff.net>
Jeff King <peff@peff.net> writes:
> I ran across a real-world case where git segfaults on some trees that
> have duplicate entries. Those trees are obviously broken, and I'm fine
> with us producing whatever output we like on them. But probably we
> shouldn't segfault.
Thanks.
Show 7 quoted lines
> ...
> That does fix this problem, and it doesn't break any other tests. But
> frankly, I don't know what I'm doing and this feels like a giant hack.
>
> Given that this is tangentially related to the "-B -M" stuff you've been
> looking at (and it's your code in the first place :) ), I thought you
> might have some insight.
Indeed.

Honestly, I'd rather see us diagnose duplicate filepairs as an error and drop them on the floor upon entry to the diffcore_std(), even before we go into the rename codepath.

Previous: Jeff KingNext: Jeff King
Message 2 of 12 in “[BUG] diffcore-rename with duplicate tree entries can segfault”
  1. Jeff KingFeb 24, 2015
  2. Junio C HamanoFeb 24, 2015
  3. Jeff KingFeb 24, 2015
  4. Junio C HamanoFeb 24, 2015
  5. Jeff KingFeb 24, 2015
  6. Junio C HamanoFeb 25, 2015
  7. Jeff KingFeb 25, 2015
  8. Junio C HamanoFeb 25, 2015
  9. 0/2 diffcore-rename with duplicate tree entries can segfaultJeff King, Feb 27, 2015
  10. 1/2 diffcore-rename: split locate_rename_dst into two functionsJeff King, Feb 27, 2015
  11. 2/2 diffcore-rename: avoid processing duplicate destinationsJeff King, Feb 27, 2015
  12. Junio C HamanoFeb 27, 2015

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.