mirror of
https://github.com/git-for-windows/git.git
synced 2025-12-13 08:41:13 -06:00
4a7af4edbb
We have a couple of tests that depend on Perl for textconv scripts. Refactor these tests to instead be implemented via shell utilities so that we can drop a couple of PERL_TEST_HELPERS prerequisites. Note that the conversion in t4030 is not a one-to-one equivalent to the previous textconv script. Before this change we used to essentially do a hexdump via Perl. The obvious conversion here would be to use `test-tool hexdump` like we do for the other tests. But this would lead to a ripple effect where we would have to adapt a bunch of other tests with a bunch of seemingly unrelated changes, which would be somewhat awkward. Instead, we're going with the minimum viable change: the test files we write contain "\001" and "\000", and the test's expectation is that those get translated into proper ASCII characters. So instead of doing a full hexdump, we simply use tr(1) to translate these specific bytes. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
76 lines
1.7 KiB
Bash
Executable File
76 lines
1.7 KiB
Bash
Executable File
#!/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() {
|
|
# common first line to help identify rewrite versus regular diff
|
|
printf "=\n" >file
|
|
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
|
|
done >>file
|
|
}
|
|
|
|
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
|
|
'
|
|
|
|
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' '
|
|
git diff -B --stat --summary >diff &&
|
|
grep "Bin" diff &&
|
|
test_grep "0 insertions.*0 deletions" diff &&
|
|
grep " rewrite file" diff
|
|
'
|
|
|
|
test_expect_success 'setup textconv' '
|
|
write_script dump <<-\EOF &&
|
|
test-tool hexdump <"$1"
|
|
EOF
|
|
echo file diff=foo >.gitattributes &&
|
|
git config diff.foo.textconv "\"$(pwd)\""/dump
|
|
'
|
|
|
|
test_expect_success 'rewrite diff respects textconv' '
|
|
git diff -B >diff &&
|
|
test_grep "dissimilarity index" diff &&
|
|
test_grep "^-3d 0a 00" diff &&
|
|
test_grep "^+3d 0a 01" diff
|
|
'
|
|
|
|
test_done
|