• Junio C Hamano's avatar
    diff: retire "compaction" heuristics · 3cde4e02
    Junio C Hamano authored
    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.
    Suggested-by: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    3cde4e02
diff-heuristic-options.txt 202 Bytes