Merge branch 'pw/diff-color-moved-fix' into seen
authorJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:24 +0000 (16:30 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:24 +0000 (16:30 +0900)
commit7bf7283a9acac6e6e481b9b02ec2194c7c3bc796
tree579237a29e564ff434285c6e342ab79e78d2c70d
parentba2c2e8c5914aab381e1cba235781bc3fa4b1f91
parent1184a0e5e1c833d4cec23c12a38e193a4cd132d6
Merge branch 'pw/diff-color-moved-fix' into seen

Long-overdue correctness and performance update to "diff
--color-moved" feature.

* pw/diff-color-moved-fix:
  diff --color-moved: intern strings
  diff --color-moved-ws=allow-indentation-change: improve hash lookups
  diff --color-moved: stop clearing potential moved blocks
  diff --color-moved: shrink potential moved blocks as we go
  diff --color-moved: unify moved block growth functions
  diff --color-moved: call comparison function directly
  diff --color-moved-ws=allow-indentation-change: simplify and optimize
  diff: simplify allow-indentation-change delta calculation
  diff --color-moved: avoid false short line matches and bad zebra coloring
  diff --color-moved=zebra: fix alternate coloring
diff.c