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 25, 2015, 05:00 UTC
Message-ID
<xmqq8ufmpouz.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20150224234737.GA8370@peff.net>
Jeff King <peff@peff.net> writes:
Show 6 quoted lines
>   3. The sort order check is wrong. :-/ It needs to take into account
>      git's magic "if it's a tree, pretend it has '/' after it" rule.
>      That's not too hard for a single tree (fsck.c:verify_ordered does
>      it). But for filepairs, I'm not sure what to do. Most cases
>      have a single mode/name pair. But what about a D/F typechange? If
>      "foo" becomes "foo/", which do I use to sort?

I think diff-index populates the diff queue in a wrong order and then calls diffcore_fix_diff_index() to fix it up.

I am a bit worried about the effect this stricter input check might have to "diff --no-index" codepath, though.

Previous: Jeff KingNext: Jeff King
Message 6 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.