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

Re: [PATCH 0/2] Make diff plumbing commands respect the indentHeuristic.

From
Junio C Hamano <gitster@pobox.com>
Date
May 9, 2017, 04:06 UTC
Message-ID
<xmqqbmr24qt2.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20170509031653.7hc36pil3vzrobsz@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 6 quoted lines
> I do feel a bit sad about breaking this case (or at the very least
> forcing you to set an option to retain cross-version compatibility). But
> my gut says that we don't want to lock ourselves into never changing the
> diff algorithm (and I'm sure we've done it inadvertently a few times
> over the years; even the recent switch to turning on renames would have
> had that impact).

IIRC, we never promised that different versions of Git produce the same patch ID for the same change. I do share that sadness, as not making that promise would affect not just such an external database keyed with patch-ids but also affects the rerere database, and those who heavily depend on the rerere database would need to refresh them every time diff/merge algorithm is updated, using something like contrib/rerere-train.sh script.

But at the same time, I am very much against promising that the textual diff output will never improve for human readability.

Previous: Jeff KingNext: Ævar Arnfjörð Bjarmason
Message 15 of 35 in “Make diff plumbing commands respect the indentHeuristic.”
  1. 0/2 Make diff plumbing commands respect the indentHeuristic.Marc Branchaud, Apr 27, 2017
  2. 2/2 Have the diff-* builtins configure diff before initializing revisions.Marc Branchaud, Apr 27, 2017
  3. Jeff KingApr 28, 2017
  4. Junio C HamanoMay 1, 2017
  5. Jeff KingMay 1, 2017
  6. Jeff KingMay 1, 2017
  7. 1/2 Make the indent heuristic part of diff's basic configuration.Marc Branchaud, Apr 27, 2017
  8. Jeff KingApr 28, 2017
  9. Jeff KingApr 28, 2017
  10. Stefan BellerApr 28, 2017
  11. Jeff KingApr 28, 2017
  12. Stefan BellerApr 28, 2017
  13. Ævar Arnfjörð BjarmasonMay 1, 2017
  14. Jeff KingMay 9, 2017
  15. Junio C HamanoMay 9, 2017
  16. Ævar Arnfjörð BjarmasonMay 9, 2017
  17. Jeff KingMay 9, 2017
  18. 0/3 Make diff plumbing commands respect the indentHeuristic.Marc Branchaud, Apr 28, 2017
  19. 1/3 diff: make the indent heuristic part of diff's basic configurationMarc Branchaud, Apr 28, 2017
  20. 2/3 diff: have the diff-* builtins configure diff before initializing revisionsMarc Branchaud, Apr 28, 2017
  21. 3/3 diff: enable indent heuristic by defaultMarc Branchaud, Apr 28, 2017
  22. Jeff KingApr 29, 2017
  23. Jeff KingApr 29, 2017
  24. Junio C HamanoMay 1, 2017
  25. Jeff KingMay 1, 2017
  26. Junio C HamanoMay 1, 2017
  27. 0/4 Make diff plumbing commands respect the indentHeuristic.Marc Branchaud, May 1, 2017
  28. 2/4 diff: have the diff-* builtins configure diff before initializing revisionsMarc Branchaud, May 1, 2017
  29. 1/4 diff: make the indent heuristic part of diff's basic configurationMarc Branchaud, May 1, 2017
  30. 4/4 add--interactive: drop diff.indentHeuristic handlingMarc Branchaud, May 1, 2017
  31. 3/4 diff: enable indent heuristic by defaultMarc Branchaud, May 1, 2017
  32. Jeff KingMay 1, 2017
  33. Stefan BellerMay 1, 2017
  34. 4/3 add--interactive: drop diff.indentHeuristic handlingJeff King, Apr 29, 2017
  35. Michael HaggertyApr 30, 2017

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.