mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-19 07:12:51 -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>
67 lines
1.7 KiB
Bash
Executable File
67 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='detect some push errors early (before contacting remote)'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup commits' '
|
|
test_commit one
|
|
'
|
|
|
|
test_expect_success 'setup remote' '
|
|
git init --bare remote.git &&
|
|
git remote add origin remote.git
|
|
'
|
|
|
|
test_expect_success 'setup fake receive-pack' '
|
|
FAKE_RP_ROOT=$(pwd) &&
|
|
export FAKE_RP_ROOT &&
|
|
write_script fake-rp <<-\EOF &&
|
|
echo yes >"$FAKE_RP_ROOT"/rp-ran
|
|
exit 1
|
|
EOF
|
|
git config remote.origin.receivepack "\"\$FAKE_RP_ROOT/fake-rp\""
|
|
'
|
|
|
|
test_expect_success 'detect missing branches early' '
|
|
echo no >rp-ran &&
|
|
echo no >expect &&
|
|
test_must_fail git push origin missing &&
|
|
test_cmp expect rp-ran
|
|
'
|
|
|
|
test_expect_success 'detect missing sha1 expressions early' '
|
|
echo no >rp-ran &&
|
|
echo no >expect &&
|
|
test_must_fail git push origin main~2:main &&
|
|
test_cmp expect rp-ran
|
|
'
|
|
|
|
# We use an existing local_ref, since it follows a different flow in
|
|
# 'builtin/push.c:set_refspecs()' and we want to test that regression.
|
|
test_expect_success 'detect empty remote with existing local ref' '
|
|
test_must_fail git push "" main 2> stderr &&
|
|
test_grep "fatal: bad repository ${SQ}${SQ}" stderr
|
|
'
|
|
|
|
# While similar to the previous test, here we want to ensure that
|
|
# even targeted refspecs are handled.
|
|
test_expect_success 'detect empty remote with targeted refspec' '
|
|
test_must_fail git push "" HEAD:refs/heads/main 2> stderr &&
|
|
test_grep "fatal: bad repository ${SQ}${SQ}" stderr
|
|
'
|
|
|
|
test_expect_success 'detect ambiguous refs early' '
|
|
git branch foo &&
|
|
git tag foo &&
|
|
echo no >rp-ran &&
|
|
echo no >expect &&
|
|
test_must_fail git push origin foo &&
|
|
test_cmp expect rp-ran
|
|
'
|
|
|
|
test_done
|