2008-12-09 16:12:28 +08:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='rewrite diff on binary file'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
# We must be large enough to meet the MINIMUM_BREAK_SIZE
|
|
|
|
# requirement.
|
|
|
|
make_file() {
|
2008-12-09 16:13:21 +08:00
|
|
|
# common first line to help identify rewrite versus regular diff
|
|
|
|
printf "=\n" >file
|
2008-12-09 16:12:28 +08:00
|
|
|
for i in 1 2 3 4 5 6 7 8 9 10
|
|
|
|
do
|
|
|
|
for j in 1 2 3 4 5 6 7 8 9
|
|
|
|
do
|
|
|
|
for k in 1 2 3 4 5
|
|
|
|
do
|
|
|
|
printf "$1\n"
|
|
|
|
done
|
|
|
|
done
|
2008-12-09 16:13:21 +08:00
|
|
|
done >>file
|
2008-12-09 16:12:28 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'create binary file with changes' '
|
|
|
|
make_file "\\0" &&
|
|
|
|
git add file &&
|
|
|
|
make_file "\\01"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'vanilla diff is binary' '
|
|
|
|
git diff >diff &&
|
|
|
|
grep "Binary files a/file and b/file differ" diff
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rewrite diff is binary' '
|
|
|
|
git diff -B >diff &&
|
|
|
|
grep "dissimilarity index" diff &&
|
|
|
|
grep "Binary files a/file and b/file differ" diff
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rewrite diff can show binary patch' '
|
|
|
|
git diff -B --binary >diff &&
|
|
|
|
grep "dissimilarity index" diff &&
|
|
|
|
grep "GIT binary patch" diff
|
|
|
|
'
|
|
|
|
|
2012-03-13 13:05:54 +08:00
|
|
|
test_expect_success 'rewrite diff --numstat shows binary changes' '
|
|
|
|
git diff -B --numstat --summary >diff &&
|
|
|
|
grep -e "- - " diff &&
|
|
|
|
grep " rewrite file" diff
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'diff --stat counts binary rewrite as 0 lines' '
|
2011-02-19 16:04:56 +08:00
|
|
|
git diff -B --stat --summary >diff &&
|
|
|
|
grep "Bin" diff &&
|
2012-03-13 13:05:54 +08:00
|
|
|
test_i18ngrep "0 insertions.*0 deletions" diff &&
|
2011-02-19 16:04:56 +08:00
|
|
|
grep " rewrite file" diff
|
|
|
|
'
|
|
|
|
|
2008-12-09 16:13:21 +08:00
|
|
|
{
|
|
|
|
echo "#!$SHELL_PATH"
|
2008-12-11 03:39:07 +08:00
|
|
|
cat <<'EOF'
|
2012-06-13 00:49:59 +08:00
|
|
|
"$PERL_PATH" -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"
|
2008-12-09 16:13:21 +08:00
|
|
|
EOF
|
|
|
|
} >dump
|
|
|
|
chmod +x dump
|
|
|
|
|
|
|
|
test_expect_success 'setup textconv' '
|
|
|
|
echo file diff=foo >.gitattributes &&
|
2010-01-02 06:15:18 +08:00
|
|
|
git config diff.foo.textconv "\"$(pwd)\""/dump
|
2008-12-09 16:13:21 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rewrite diff respects textconv' '
|
|
|
|
git diff -B >diff &&
|
|
|
|
grep "dissimilarity index" diff &&
|
|
|
|
grep "^-61" diff &&
|
|
|
|
grep "^-0" diff
|
|
|
|
'
|
|
|
|
|
2008-12-09 16:12:28 +08:00
|
|
|
test_done
|