mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-22 06:10:17 -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>
78 lines
2.0 KiB
Bash
Executable File
78 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='setup: validation of .git file/directory types
|
|
|
|
Verify that setup_git_directory() correctly handles:
|
|
1. Valid .git directories (including symlinks to them).
|
|
2. Invalid .git files (FIFOs, sockets) by erroring out.
|
|
3. Invalid .git files (garbage) by erroring out.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup: create parent git repository' '
|
|
git init parent &&
|
|
test_commit -C parent "root-commit"
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'setup: .git as a symlink to a directory is valid' '
|
|
test_when_finished "rm -rf parent/link-to-dir" &&
|
|
mkdir -p parent/link-to-dir &&
|
|
(
|
|
cd parent/link-to-dir &&
|
|
git init real-repo &&
|
|
ln -s real-repo/.git .git &&
|
|
git rev-parse --git-dir >actual &&
|
|
echo .git >expect &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success PIPE 'setup: .git as a FIFO (named pipe) is rejected' '
|
|
test_when_finished "rm -rf parent/fifo-trap" &&
|
|
mkdir -p parent/fifo-trap &&
|
|
(
|
|
cd parent/fifo-trap &&
|
|
mkfifo .git &&
|
|
test_must_fail git rev-parse --git-dir 2>stderr &&
|
|
test_grep "not a regular file" stderr
|
|
)
|
|
'
|
|
|
|
test_expect_success SYMLINKS,PIPE 'setup: .git as a symlink to a FIFO is rejected' '
|
|
test_when_finished "rm -rf parent/symlink-fifo-trap" &&
|
|
mkdir -p parent/symlink-fifo-trap &&
|
|
(
|
|
cd parent/symlink-fifo-trap &&
|
|
mkfifo target-fifo &&
|
|
ln -s target-fifo .git &&
|
|
test_must_fail git rev-parse --git-dir 2>stderr &&
|
|
test_grep "not a regular file" stderr
|
|
)
|
|
'
|
|
|
|
test_expect_success 'setup: .git with garbage content is rejected' '
|
|
test_when_finished "rm -rf parent/garbage-trap" &&
|
|
mkdir -p parent/garbage-trap &&
|
|
(
|
|
cd parent/garbage-trap &&
|
|
echo "garbage" >.git &&
|
|
test_must_fail git rev-parse --git-dir 2>stderr &&
|
|
test_grep "invalid gitfile format" stderr
|
|
)
|
|
'
|
|
|
|
test_expect_success 'setup: .git as an empty directory is ignored' '
|
|
test_when_finished "rm -rf parent/empty-dir" &&
|
|
mkdir -p parent/empty-dir &&
|
|
(
|
|
cd parent/empty-dir &&
|
|
git rev-parse --git-dir >expect &&
|
|
mkdir .git &&
|
|
git rev-parse --git-dir >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_done
|