]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'pw/diff-color-moved-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2022 22:01:29 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2022 22:01:29 +0000 (14:01 -0800)
commit2b755b337134aac9b1386e2d216cf734e1e229d2
treea1ffb96dc36429bc60a9b4b4a53a96b0ed140f42
parentead6767ad7f835f4802248371709c4506ad6a4f1
parent72962e8b3c3ea3a631166876b4668718103be4fe
Merge branch 'pw/diff-color-moved-fix'

Correctness and performance update to "diff --color-moved" feature.

* pw/diff-color-moved-fix:
  diff --color-moved: intern strings
  diff: use designated initializers for emitted_diff_symbol
  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 --color-moved: rewind when discarding pmb
  diff --color-moved: factor out function
  diff --color-moved: clear all flags on blocks that are too short
  diff --color-moved: add perf tests
diff.c
t/t4015-diff-whitespace.sh