Code

diff: fix "git show -C -C" output when renaming a binary file
authorChristian Couder <chriscool@tuxfamily.org>
Wed, 26 May 2010 02:50:12 +0000 (04:50 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Jun 2010 22:14:27 +0000 (15:14 -0700)
commit296c6bb21a6980f6e5b42f0790d6365c1e3f696f
treeee5833c88e3945984a5e87f5c428c5571c0efc8c
parentdfea79004c54bc96143386d6ac22de500ba4f747
diff: fix "git show -C -C" output when renaming a binary file

A bug was introduced in 3e97c7c6af2901cec63bf35fcd43ae3472e24af8
(No diff -b/-w output for all-whitespace changes, Nov 19 2009)
that made the lines:

  diff --git a/bar b/sub/bar
  similarity index 100%
  rename from bar
  rename to sub/bar

disappear from "git show -C -C" output when file bar is a binary
file.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
t/t4015-diff-whitespace.sh
t/t4043-diff-rename-binary.sh [new file with mode: 0755]