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

Re: comparing file contents in is_exact_match?

From
Junio C Hamano <junkio@cox.net>
Date
Jul 6, 2006, 06:20 UTC
Message-ID
<7vd5cj9rvm.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20060706055729.GA12512@admingilde.org>
Martin Waitz <tali@admingilde.org> writes:
Show 11 quoted lines
> The reason for that is that is_exact_match (in diffcore-rename.c) maps
> both the source and destination file into memory and then compares them
> byte for byte.  This is a little bit too much for my little machine.
>
> When I remove the content comparation and only leave the sha1
> comparision, then my renames are correctly found in a second.  But
> unluckily, some other renames in the testcases are not correctly
> handled any more.
>
> So is there an easy solution?  Why is the content comparision in
> is_exact_match needed?

Because your working tree can be out of sync with respect to what's in the index, in which case we cannot trust the sha1 while running diff-index (without --cached flag).

git-update-index --refresh before doing anything might help.
Previous: Martin WaitzNext: Martin Waitz
Message 2 of 32 in “comparing file contents in is_exact_match?”
  1. Martin WaitzJul 6, 2006
  2. Junio C HamanoJul 6, 2006
  3. Martin WaitzJul 6, 2006
  4. Junio C HamanoJul 6, 2006
  5. Martin WaitzJul 6, 2006
  6. Martin WaitzJul 6, 2006
  7. Florian WeimerJul 7, 2006
  8. Johannes SchindelinJul 8, 2006
  9. Florian WeimerJul 16, 2006
  10. Johannes SchindelinJul 16, 2006
  11. Yakov LernerJul 16, 2006
  12. Alex RiesenJul 16, 2006
  13. Florian WeimerJul 17, 2006
  14. Johannes SchindelinJul 17, 2006
  15. Linus TorvaldsJul 17, 2006
  16. Johannes SchindelinJul 17, 2006
  17. Linus TorvaldsJul 17, 2006
  18. Martin WaitzJul 17, 2006
  19. Alex RiesenJul 17, 2006
  20. Geert BoschJul 17, 2006
  21. Linus TorvaldsJul 17, 2006
  22. Yakov LernerJul 18, 2006
  23. Johannes SchindelinJul 18, 2006
  24. Linus TorvaldsJul 18, 2006
  25. Alex RiesenJul 18, 2006
  26. Juergen RuehleJul 17, 2006
  27. Johannes SchindelinJul 17, 2006
  28. Juergen RuehleJul 17, 2006
  29. Yakov LernerJul 17, 2006
  30. Juergen RuehleJul 17, 2006
  31. Yakov LernerJul 18, 2006
  32. Yakov LernerJul 17, 2006

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.