From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Nov 2017 04:11:23 +0000 (+0900)
Subject: Merge branch 'jk/diff-color-moved-fix'
X-Git-Tag: v2.16.0-rc0~180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a55427094c33de1f0e6465feb26f2964b3fe558;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-color-moved-fix'

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
---

7a55427094c33de1f0e6465feb26f2964b3fe558