mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-28 06:35:27 -05:00
cd352cab5b
Replace bare grep with test_grep in test assertions across the
suite, including sourced test helpers (lib-*.sh, *-tests.sh).
test_grep prints the contents of the file being searched on
failure, making debugging easier than a bare grep which fails
silently.
Only assertion-style greps are converted: grep used as a filter
in pipelines, command substitutions, conditionals, or with
redirected I/O is left as-is with a "# lint-ok" annotation.
Existing '! test_grep' calls are rewritten to 'test_grep !' so
that the diagnostic output is preserved on failure.
The conversion was generated using a grep-assertion linter
(greplint.pl, added in the following commit) to identify bare
grep calls at command position. To reproduce:
# Step 1: mark bare greps that should not be converted
sed -i '/! grep "$m" \.git\/packed-refs/s/$/ # lint-ok: file may not exist (reftable)/' \
t/t1400-update-ref.sh
sed -i '/! grep dirty file3 &&/{/lint-ok/!s/$/ # lint-ok: file may not exist after --quit/}' \
t/t3420-rebase-autostash.sh
sed -i '/grep -vf before commits\.raw/s/$/ # lint-ok: data filter/' \
t/t5326-multi-pack-bitmaps.sh
sed -i '/! grep $d shallow-client\/\.git\/shallow/s/$/ # lint-ok: file may not exist after repack/' \
t/t5537-fetch-shallow.sh
sed -i '/grep -E "^\[0-9a-f\].*|| :/s/$/ # lint-ok: data filter/' \
t/t5702-protocol-v2.sh
sed -i '/! grep gitdir squatting-clone/s/$/ # lint-ok: file may not exist after failed clone/' \
t/t7450-bad-git-dotfiles.sh
# Step 2: reorder pre-existing '! test_grep' to 'test_grep !'
# (must come before steps 3-4 so greplint does not see them)
sed -i 's/! test_grep/test_grep !/' t/t0031-lockfile-pid.sh
sed -i 's/! test_grep/test_grep !/' t/t5300-pack-object.sh
sed -i 's/! test_grep/test_grep !/' t/t5319-multi-pack-index.sh
# Step 3: convert '! grep' -> 'test_grep !'
perl t/greplint.pl t/*.sh 2>&1 | cut -d: -f1,2 |
while IFS=: read f l; do
sed -i "${l}s/! *grep/test_grep !/" "$f"
done
# Step 4: convert remaining 'grep' -> 'test_grep'
perl t/greplint.pl t/*.sh 2>&1 | cut -d: -f1,2 |
while IFS=: read f l; do
sed -i "${l}s/grep/test_grep/" "$f"
done
To verify, run: make -C t test-greplint
Signed-off-by: Michael Montalbo <mmontalbo@gmail.com>
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 &&
|
|
test_grep "Binary files a/file and b/file differ" diff
|
|
'
|
|
|
|
test_expect_success 'rewrite diff is binary' '
|
|
git diff -B >diff &&
|
|
test_grep "dissimilarity index" diff &&
|
|
test_grep "Binary files a/file and b/file differ" diff
|
|
'
|
|
|
|
test_expect_success 'rewrite diff can show binary patch' '
|
|
git diff -B --binary >diff &&
|
|
test_grep "dissimilarity index" diff &&
|
|
test_grep "GIT binary patch" diff
|
|
'
|
|
|
|
test_expect_success 'rewrite diff --numstat shows binary changes' '
|
|
git diff -B --numstat --summary >diff &&
|
|
test_grep -e "- - " diff &&
|
|
test_grep " rewrite file" diff
|
|
'
|
|
|
|
test_expect_success 'diff --stat counts binary rewrite as 0 lines' '
|
|
git diff -B --stat --summary >diff &&
|
|
test_grep "Bin" diff &&
|
|
test_grep "0 insertions.*0 deletions" diff &&
|
|
test_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
|