On 12/23/2016 10:17 PM, Junio C Hamano wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> I guess both you and Michael are in favor of just removing compaction >> variant without any renames, so let me prepare a reroll and queue >> that instead. We can flip the default perhaps one release later. > > -- >8 -- > Subject: [PATCH] diff: retire "compaction" heuristics > > When a patch inserts a block of lines, whose last lines are the > same as the existing lines that appear before the inserted block, > "git diff" can choose any place between these existing lines as the > boundary between the pre-context and the added lines (adjusting the > end of the inserted block as appropriate) to come up with variants > of the same patch, and some variants are easier to read than others. > > We have been trying to improve the choice of this boundary, and Git > 2.11 shipped with an experimental "compaction-heuristic". Since > then another attempt to improve the logic further resulted in a new > "indent-heuristic" logic. It is agreed that the latter gives better > result overall, and the former outlived its usefulness. > > Retire "compaction", and keep "indent" as an experimental feature. > The latter hopefully will be turned on by default in a future > release, but that should be done as a separate step. The whole patch looks good to me. Thanks for taking care of this. Michael