diff: fix "git show -C -C" output when renaming a binary file
A bug was introduced in 3e97c7c6af
(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>
This commit is contained in:

committed by
Junio C Hamano

parent
dfea79004c
commit
296c6bb21a
45
t/t4043-diff-rename-binary.sh
Executable file
45
t/t4043-diff-rename-binary.sh
Executable file
@ -0,0 +1,45 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2010 Jakub Narebski, Christian Couder
|
||||
#
|
||||
|
||||
test_description='Move a binary file'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
|
||||
test_expect_success 'prepare repository' '
|
||||
git init &&
|
||||
echo foo > foo &&
|
||||
echo "barQ" | q_to_nul > bar &&
|
||||
git add . &&
|
||||
git commit -m "Initial commit"
|
||||
'
|
||||
|
||||
test_expect_success 'move the files into a "sub" directory' '
|
||||
mkdir sub &&
|
||||
git mv bar foo sub/ &&
|
||||
git commit -m "Moved to sub/"
|
||||
'
|
||||
|
||||
cat > expected <<\EOF
|
||||
bar => sub/bar | Bin 5 -> 5 bytes
|
||||
foo => sub/foo | 0
|
||||
2 files changed, 0 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/bar b/sub/bar
|
||||
similarity index 100%
|
||||
rename from bar
|
||||
rename to sub/bar
|
||||
diff --git a/foo b/sub/foo
|
||||
similarity index 100%
|
||||
rename from foo
|
||||
rename to sub/foo
|
||||
EOF
|
||||
|
||||
test_expect_success 'git show -C -C report renames' '
|
||||
git show -C -C --raw --binary --stat | tail -n 12 > current &&
|
||||
test_cmp expected current
|
||||
'
|
||||
|
||||
test_done
|
Reference in New Issue
Block a user