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

Re: [PATCH v4 4/4] add--interactive: drop diff.indentHeuristic handling

From
Jeff King <peff@peff.net>
Date
May 9, 2017, 03:29 UTC
Message-ID
<20170509032959.42nt6vbrt7zh3nkb@sigill.intra.peff.net>
In-Reply-To
<20170508160339.4551-5-marcnarc@xiplink.com>
On Mon, May 08, 2017 at 12:03:39PM -0400, Marc Branchaud wrote:
Show 7 quoted lines
> @@ -730,9 +729,6 @@ sub parse_diff {
>  	if (defined $diff_algorithm) {
>  		splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
>  	}
> -	if ($diff_indent_heuristic) {
> -		splice @diff_cmd, 1, 0, "--indent-heuristic";
> -	}

I don't remember if I mentioned this before, but this series (and the reasoning why it is OK to tweak the default) did make me wonder if it be reasonable to respect diff.algorithm even in plumbing.

I don't actually use it myself, and certainly it would not need to be part of this series. But perhaps if somebody is really into alternate diff algorithms they'd be interested in following it up (my own experience with alternate algorithms has usually been "wow, this diff is ugly; I wonder if --patience helps" followed by "nope, still ugly").

-Peff
Previous: Marc BranchaudNext: Marc Branchaud
Message 6 of 14 in “What's cooking in git.git (May 2017, #02; Mon, 8)”
  1. Junio C HamanoMay 8, 2017
  2. Enabling the diff "indent" heuristic by defaultMarc Branchaud, May 8, 2017
  3. 0/4 Make diff plumbing commands respect the indentHeuristic.Marc Branchaud, May 8, 2017
  4. 1/4 diff: make the indent heuristic part of diff's basic configurationMarc Branchaud, May 8, 2017
  5. 4/4 add--interactive: drop diff.indentHeuristic handlingMarc Branchaud, May 8, 2017
  6. Jeff KingMay 9, 2017
  7. 2/4 diff: have the diff-* builtins configure diff before initializing revisionsMarc Branchaud, May 8, 2017
  8. Jeff KingMay 9, 2017
  9. Marc BranchaudMay 11, 2017
  10. 3/4 diff: enable indent heuristic by defaultMarc Branchaud, May 8, 2017
  11. Stefan BellerMay 8, 2017
  12. Jeff KingMay 9, 2017
  13. Jeff KingMay 9, 2017
  14. Jeff KingMay 9, 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.