Merge branch 'jk/diff-color-moved-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:04:51 +0000 (12:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Nov 2017 03:04:51 +0000 (12:04 +0900)
commitfd506238f0f067e5bc2d310882007132364f76f2
tree063aeb5e60e0ca0e5b5d5a3ce1d38072fc433f5f
parente18b1df299a82c8edc262091dc0b77b1f13c5f0b
parentb66b5072921fb706f1e9352f471098c988b0ca39
Merge branch 'jk/diff-color-moved-fix' into maint

The experimental "color moved lines differently in diff output"
feature was buggy around "ignore whitespace changes" edges, whihch
has been corrected.

* jk/diff-color-moved-fix:
  diff: handle NULs in get_string_hash()
  diff: fix whitespace-skipping with --color-moved
  t4015: test the output of "diff --color-moved -b"
  t4015: check "negative" case for "-w --color-moved"
  t4015: refactor --color-moved whitespace test