Michael Montalbo
47f79f6198
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.
test_grep requires the file it reads to exist, so '! grep'
assertions that inspect a file whose presence is conditional need
care. In t5537 the '.git/shallow' file is still present after the
repack (the client remains shallow), so the assertion is
converted like any other. In t1400 the '.git/packed-refs' file
exists only with the files backend, so its check is guarded with a
REFFILES prerequisite; the backend-agnostic 'git show-ref' check
that follows still runs under every backend. In t7450 'git~2' is
the NTFS 8.3 short name of a '..git' file and only exists
when 8.3 short-name generation is enabled, so its check is guarded
with a 'test -f' on the path and uses test_grep inside the guard,
the same shape as t1400 (a plain test_grep would BUG when the
short name is absent).
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, from the t/
directory:
# Step 1: annotate the two data-filter greps (grep produces
# data, not a verdict) so the linter skips them.
sed -i '/grep -vf before commits\.raw/s/$/ # lint-ok: data filter/' \
t5326-multi-pack-bitmaps.sh
sed -i '/grep -E "^\[0-9a-f\].*|| :/s/$/ # lint-ok: data filter/' \
t5702-protocol-v2.sh
# Step 1b: two '! grep' assertions need more than a mechanical
# conversion; handle them by hand before the linter-driven steps
# below so it leaves them alone.
#
# t1400: '.git/packed-refs' is absent under reftable, so guard the
# check with REFFILES (a plain test_grep would BUG on the missing
# file):
#
# git update-ref -d HEAD $B &&
# - ! grep "$m" .git/packed-refs &&
# + if test_have_prereq REFFILES
# + then
# + test_grep ! "$m" .git/packed-refs
# + fi &&
# test_must_fail git show-ref --verify -q $m
#
# t7450: git~2 is an NTFS 8.3 short name that exists only when
# short-name generation is enabled, so guard the check on its
# presence with 'test -f' and note in a comment why the path can
# be absent (a plain test_grep would BUG when it is):
#
# - ! grep gitdir squatting-clone/d/a/git~2
# + if test -f squatting-clone/d/a/git~2
# + then
# + test_grep ! gitdir squatting-clone/d/a/git~2
# + fi
# 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 !/' t0031-lockfile-pid.sh
sed -i 's/! test_grep/test_grep !/' t5300-pack-object.sh
sed -i 's/! test_grep/test_grep !/' t5319-multi-pack-index.sh
# Step 3: convert '! grep' -> 'test_grep !'
perl greplint.pl *.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 greplint.pl *.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>
458 lines
14 KiB
Bash
458 lines
14 KiB
Bash
pack_refs=${pack_refs:-pack-refs}
|
|
|
|
test_expect_success 'enable reflogs' '
|
|
git config core.logallrefupdates true
|
|
'
|
|
|
|
test_expect_success 'prepare a trivial repository' '
|
|
echo Hello > A &&
|
|
git update-index --add A &&
|
|
git commit -m "Initial commit." &&
|
|
HEAD=$(git rev-parse --verify HEAD)
|
|
'
|
|
|
|
test_expect_success '${pack_refs} --prune --all' '
|
|
test_path_is_missing .git/packed-refs &&
|
|
git ${pack_refs} --no-prune --all &&
|
|
test_path_is_file .git/packed-refs &&
|
|
N=$(find .git/refs -type f | wc -l) &&
|
|
test "$N" != 0 &&
|
|
|
|
git ${pack_refs} --prune --all &&
|
|
test_path_is_file .git/packed-refs &&
|
|
N=$(find .git/refs -type f) &&
|
|
test -z "$N"
|
|
'
|
|
|
|
SHA1=
|
|
|
|
test_expect_success 'see if git show-ref works as expected' '
|
|
git branch a &&
|
|
SHA1=$(cat .git/refs/heads/a) &&
|
|
echo "$SHA1 refs/heads/a" >expect &&
|
|
git show-ref a >result &&
|
|
test_cmp expect result
|
|
'
|
|
|
|
test_expect_success 'see if a branch still exists when packed' '
|
|
git branch b &&
|
|
git ${pack_refs} --all &&
|
|
rm -f .git/refs/heads/b &&
|
|
echo "$SHA1 refs/heads/b" >expect &&
|
|
git show-ref b >result &&
|
|
test_cmp expect result
|
|
'
|
|
|
|
test_expect_success 'git branch c/d should barf if branch c exists' '
|
|
git branch c &&
|
|
git ${pack_refs} --all &&
|
|
rm -f .git/refs/heads/c &&
|
|
test_must_fail git branch c/d
|
|
'
|
|
|
|
test_expect_success 'see if a branch still exists after git ${pack_refs} --prune' '
|
|
git branch e &&
|
|
git ${pack_refs} --all --prune &&
|
|
echo "$SHA1 refs/heads/e" >expect &&
|
|
git show-ref e >result &&
|
|
test_cmp expect result
|
|
'
|
|
|
|
test_expect_success 'see if git ${pack_refs} --prune remove ref files' '
|
|
git branch f &&
|
|
git ${pack_refs} --all --prune &&
|
|
test_path_is_missing .git/refs/heads/f
|
|
'
|
|
|
|
test_expect_success 'see if git ${pack_refs} --prune removes empty dirs' '
|
|
git branch r/s/t &&
|
|
git ${pack_refs} --all --prune &&
|
|
test_path_is_missing .git/refs/heads/r
|
|
'
|
|
|
|
test_expect_success 'git branch g should work when git branch g/h has been deleted' '
|
|
git branch g/h &&
|
|
git ${pack_refs} --all --prune &&
|
|
git branch -d g/h &&
|
|
git branch g &&
|
|
git ${pack_refs} --all &&
|
|
git branch -d g
|
|
'
|
|
|
|
test_expect_success 'git branch i/j/k should barf if branch i exists' '
|
|
git branch i &&
|
|
git ${pack_refs} --all --prune &&
|
|
test_must_fail git branch i/j/k
|
|
'
|
|
|
|
test_expect_success 'test git branch k after branch k/l/m and k/lm have been deleted' '
|
|
git branch k/l &&
|
|
git branch k/lm &&
|
|
git branch -d k/l &&
|
|
git branch k/l/m &&
|
|
git branch -d k/l/m &&
|
|
git branch -d k/lm &&
|
|
git branch k
|
|
'
|
|
|
|
test_expect_success 'test git branch n after some branch deletion and pruning' '
|
|
git branch n/o &&
|
|
git branch n/op &&
|
|
git branch -d n/o &&
|
|
git branch n/o/p &&
|
|
git branch -d n/op &&
|
|
git ${pack_refs} --all --prune &&
|
|
git branch -d n/o/p &&
|
|
git branch n
|
|
'
|
|
|
|
test_expect_success 'test excluded refs are not packed' '
|
|
git branch dont_pack1 &&
|
|
git branch dont_pack2 &&
|
|
git branch pack_this &&
|
|
git ${pack_refs} --all --exclude "refs/heads/dont_pack*" &&
|
|
test_path_is_file .git/refs/heads/dont_pack1 &&
|
|
test_path_is_file .git/refs/heads/dont_pack2 &&
|
|
test_path_is_missing .git/refs/heads/pack_this'
|
|
|
|
test_expect_success 'test --no-exclude refs clears excluded refs' '
|
|
git branch dont_pack3 &&
|
|
git branch dont_pack4 &&
|
|
git ${pack_refs} --all --exclude "refs/heads/dont_pack*" --no-exclude &&
|
|
test_path_is_missing .git/refs/heads/dont_pack3 &&
|
|
test_path_is_missing .git/refs/heads/dont_pack4'
|
|
|
|
test_expect_success 'test only included refs are packed' '
|
|
git branch pack_this1 &&
|
|
git branch pack_this2 &&
|
|
git tag dont_pack5 &&
|
|
git ${pack_refs} --include "refs/heads/pack_this*" &&
|
|
test_path_is_file .git/refs/tags/dont_pack5 &&
|
|
test_path_is_missing .git/refs/heads/pack_this1 &&
|
|
test_path_is_missing .git/refs/heads/pack_this2'
|
|
|
|
test_expect_success 'test --no-include refs clears included refs' '
|
|
git branch pack1 &&
|
|
git branch pack2 &&
|
|
git ${pack_refs} --include "refs/heads/pack*" --no-include &&
|
|
test_path_is_file .git/refs/heads/pack1 &&
|
|
test_path_is_file .git/refs/heads/pack2'
|
|
|
|
test_expect_success 'test --exclude takes precedence over --include' '
|
|
git branch dont_pack5 &&
|
|
git ${pack_refs} --include "refs/heads/pack*" --exclude "refs/heads/pack*" &&
|
|
test_path_is_file .git/refs/heads/dont_pack5'
|
|
|
|
test_expect_success 'see if up-to-date packed refs are preserved' '
|
|
git branch q &&
|
|
git ${pack_refs} --all --prune &&
|
|
git update-ref refs/heads/q refs/heads/q &&
|
|
test_path_is_missing .git/refs/heads/q
|
|
'
|
|
|
|
test_expect_success 'pack, prune and repack' '
|
|
git tag foo &&
|
|
git ${pack_refs} --all --prune &&
|
|
git show-ref >all-of-them &&
|
|
git ${pack_refs} &&
|
|
git show-ref >again &&
|
|
test_cmp all-of-them again
|
|
'
|
|
|
|
test_expect_success 'explicit ${pack_refs} with dangling packed reference' '
|
|
git commit --allow-empty -m "soon to be garbage-collected" &&
|
|
git ${pack_refs} --all &&
|
|
git reset --hard HEAD^ &&
|
|
git reflog expire --expire=all --all &&
|
|
git prune --expire=all &&
|
|
git ${pack_refs} --all 2>result &&
|
|
test_must_be_empty result
|
|
'
|
|
|
|
test_expect_success 'delete ref with dangling packed version' '
|
|
git checkout -b lamb &&
|
|
git commit --allow-empty -m "future garbage" &&
|
|
git ${pack_refs} --all &&
|
|
git reset --hard HEAD^ &&
|
|
git checkout main &&
|
|
git reflog expire --expire=all --all &&
|
|
git prune --expire=all &&
|
|
git branch -d lamb 2>result &&
|
|
test_must_be_empty result
|
|
'
|
|
|
|
test_expect_success 'delete ref while another dangling packed ref' '
|
|
git branch lamb &&
|
|
git commit --allow-empty -m "future garbage" &&
|
|
git ${pack_refs} --all &&
|
|
git reset --hard HEAD^ &&
|
|
git reflog expire --expire=all --all &&
|
|
git prune --expire=all &&
|
|
git branch -d lamb 2>result &&
|
|
test_must_be_empty result
|
|
'
|
|
|
|
test_expect_success 'pack ref directly below refs/' '
|
|
git update-ref refs/top HEAD &&
|
|
git ${pack_refs} --all --prune &&
|
|
test_grep refs/top .git/packed-refs &&
|
|
test_path_is_missing .git/refs/top
|
|
'
|
|
|
|
test_expect_success 'do not pack ref in refs/bisect' '
|
|
git update-ref refs/bisect/local HEAD &&
|
|
git ${pack_refs} --all --prune &&
|
|
! grep refs/bisect/local .git/packed-refs >/dev/null &&
|
|
test_path_is_file .git/refs/bisect/local
|
|
'
|
|
|
|
test_expect_success 'disable reflogs' '
|
|
git config core.logallrefupdates false &&
|
|
rm -rf .git/logs
|
|
'
|
|
|
|
test_expect_success 'create packed foo/bar/baz branch' '
|
|
git branch foo/bar/baz &&
|
|
git ${pack_refs} --all --prune &&
|
|
test_path_is_missing .git/refs/heads/foo/bar/baz &&
|
|
test_must_fail git reflog exists refs/heads/foo/bar/baz
|
|
'
|
|
|
|
test_expect_success 'notice d/f conflict with existing directory' '
|
|
test_must_fail git branch foo &&
|
|
test_must_fail git branch foo/bar
|
|
'
|
|
|
|
test_expect_success 'existing directory reports concrete ref' '
|
|
test_must_fail git branch foo 2>stderr &&
|
|
test_grep refs/heads/foo/bar/baz stderr
|
|
'
|
|
|
|
test_expect_success 'notice d/f conflict with existing ref' '
|
|
test_must_fail git branch foo/bar/baz/extra &&
|
|
test_must_fail git branch foo/bar/baz/lots/of/extra/components
|
|
'
|
|
|
|
test_expect_success 'reject packed-refs with unterminated line' '
|
|
cp .git/packed-refs .git/packed-refs.bak &&
|
|
test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
|
|
printf "%s" "$HEAD refs/zzzzz" >>.git/packed-refs &&
|
|
echo "fatal: unterminated line in .git/packed-refs: $HEAD refs/zzzzz" >expected_err &&
|
|
test_must_fail git for-each-ref >out 2>err &&
|
|
test_cmp expected_err err
|
|
'
|
|
|
|
test_expect_success 'reject packed-refs containing junk' '
|
|
cp .git/packed-refs .git/packed-refs.bak &&
|
|
test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
|
|
printf "%s\n" "bogus content" >>.git/packed-refs &&
|
|
echo "fatal: unexpected line in .git/packed-refs: bogus content" >expected_err &&
|
|
test_must_fail git for-each-ref >out 2>err &&
|
|
test_cmp expected_err err
|
|
'
|
|
|
|
test_expect_success 'reject packed-refs with a short SHA-1' '
|
|
cp .git/packed-refs .git/packed-refs.bak &&
|
|
test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
|
|
printf "%.7s %s\n" $HEAD refs/zzzzz >>.git/packed-refs &&
|
|
printf "fatal: unexpected line in .git/packed-refs: %.7s %s\n" $HEAD refs/zzzzz >expected_err &&
|
|
test_must_fail git for-each-ref >out 2>err &&
|
|
test_cmp expected_err err
|
|
'
|
|
|
|
test_expect_success 'timeout if packed-refs.lock exists' '
|
|
LOCK=.git/packed-refs.lock &&
|
|
>"$LOCK" &&
|
|
test_when_finished "rm -f $LOCK" &&
|
|
test_must_fail git ${pack_refs} --all --prune
|
|
'
|
|
|
|
test_expect_success 'retry acquiring packed-refs.lock' '
|
|
LOCK=.git/packed-refs.lock &&
|
|
>"$LOCK" &&
|
|
test_when_finished "wait && rm -f $LOCK" &&
|
|
{
|
|
( sleep 1 && rm -f $LOCK ) &
|
|
} &&
|
|
git -c core.packedrefstimeout=3000 ${pack_refs} --all --prune
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'pack symlinked packed-refs' '
|
|
# First make sure that symlinking works when reading:
|
|
git update-ref refs/heads/lossy refs/heads/main &&
|
|
git for-each-ref >all-refs-before &&
|
|
mv .git/packed-refs .git/my-deviant-packed-refs &&
|
|
ln -s my-deviant-packed-refs .git/packed-refs &&
|
|
git for-each-ref >all-refs-linked &&
|
|
test_cmp all-refs-before all-refs-linked &&
|
|
git ${pack_refs} --all --prune &&
|
|
git for-each-ref >all-refs-packed &&
|
|
test_cmp all-refs-before all-refs-packed &&
|
|
test -h .git/packed-refs &&
|
|
test "$(test_readlink .git/packed-refs)" = "my-deviant-packed-refs"
|
|
'
|
|
|
|
# The 'packed-refs' file is stored directly in .git/. This means it is global
|
|
# to the repository, and can only contain refs that are shared across all
|
|
# worktrees.
|
|
test_expect_success 'refs/worktree must not be packed' '
|
|
test_commit initial &&
|
|
test_commit wt1 &&
|
|
test_commit wt2 &&
|
|
git worktree add wt1 wt1 &&
|
|
git worktree add wt2 wt2 &&
|
|
git checkout initial &&
|
|
git update-ref refs/worktree/foo HEAD &&
|
|
git -C wt1 update-ref refs/worktree/foo HEAD &&
|
|
git -C wt2 update-ref refs/worktree/foo HEAD &&
|
|
git ${pack_refs} --all &&
|
|
test_path_is_missing .git/refs/tags/wt1 &&
|
|
test_path_is_file .git/refs/worktree/foo &&
|
|
test_path_is_file .git/worktrees/wt1/refs/worktree/foo &&
|
|
test_path_is_file .git/worktrees/wt2/refs/worktree/foo
|
|
'
|
|
|
|
# we do not want to count on running ${pack_refs} to
|
|
# actually pack it, as it is perfectly reasonable to
|
|
# skip processing a broken ref
|
|
test_expect_success 'create packed-refs file with broken ref' '
|
|
test_tick && git commit --allow-empty -m one &&
|
|
recoverable=$(git rev-parse HEAD) &&
|
|
test_tick && git commit --allow-empty -m two &&
|
|
missing=$(git rev-parse HEAD) &&
|
|
rm -f .git/refs/heads/main &&
|
|
cat >.git/packed-refs <<-EOF &&
|
|
$missing refs/heads/main
|
|
$recoverable refs/heads/other
|
|
EOF
|
|
echo $missing >expect &&
|
|
git rev-parse refs/heads/main >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '${pack_refs} does not silently delete broken packed ref' '
|
|
git ${pack_refs} --all --prune &&
|
|
git rev-parse refs/heads/main >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '${pack_refs} does not drop broken refs during deletion' '
|
|
git update-ref -d refs/heads/other &&
|
|
git rev-parse refs/heads/main >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
for command in "git ${pack_refs} --all --auto" "git maintenance run --task=${pack_refs} --auto"
|
|
do
|
|
test_expect_success "$command does not repack below 16 refs without packed-refs" '
|
|
test_when_finished "rm -rf repo" &&
|
|
git init repo &&
|
|
(
|
|
cd repo &&
|
|
git config set maintenance.auto false &&
|
|
git commit --allow-empty --message "initial" &&
|
|
|
|
# Create 14 additional references, which brings us to
|
|
# 15 together with the default branch.
|
|
test_seq -f "create refs/heads/loose-%d HEAD" 14 |
|
|
git update-ref --stdin &&
|
|
test_path_is_missing .git/packed-refs &&
|
|
git ${pack_refs} --auto --all &&
|
|
test_path_is_missing .git/packed-refs &&
|
|
|
|
# Create the 16th reference, which should cause us to repack.
|
|
git update-ref refs/heads/loose-15 HEAD &&
|
|
git ${pack_refs} --auto --all &&
|
|
test_path_is_file .git/packed-refs
|
|
)
|
|
'
|
|
|
|
test_expect_success "$command does not repack below 16 refs with small packed-refs" '
|
|
test_when_finished "rm -rf repo" &&
|
|
git init repo &&
|
|
(
|
|
cd repo &&
|
|
git config set maintenance.auto false &&
|
|
git commit --allow-empty --message "initial" &&
|
|
|
|
git ${pack_refs} --all &&
|
|
test_line_count = 2 .git/packed-refs &&
|
|
|
|
# Create 15 loose references.
|
|
test_seq -f "create refs/heads/loose-%d HEAD" 15 |
|
|
git update-ref --stdin &&
|
|
git ${pack_refs} --auto --all &&
|
|
test_line_count = 2 .git/packed-refs &&
|
|
|
|
# Create the 16th loose reference, which should cause us to repack.
|
|
git update-ref refs/heads/loose-17 HEAD &&
|
|
git ${pack_refs} --auto --all &&
|
|
test_line_count = 18 .git/packed-refs
|
|
)
|
|
'
|
|
|
|
test_expect_success "$command scales with size of packed-refs" '
|
|
test_when_finished "rm -rf repo" &&
|
|
git init repo &&
|
|
(
|
|
cd repo &&
|
|
git config set maintenance.auto false &&
|
|
git commit --allow-empty --message "initial" &&
|
|
|
|
# Create 99 packed refs. This should cause the heuristic
|
|
# to require more than the minimum amount of loose refs.
|
|
test_seq -f "create refs/heads/packed-%d HEAD" 99 |
|
|
git update-ref --stdin &&
|
|
git ${pack_refs} --all &&
|
|
test_line_count = 101 .git/packed-refs &&
|
|
|
|
# Create 24 loose refs, which should not yet cause us to repack.
|
|
test_seq -f "create refs/heads/loose-%d HEAD" 24 |
|
|
git update-ref --stdin &&
|
|
git ${pack_refs} --auto --all &&
|
|
test_line_count = 101 .git/packed-refs &&
|
|
|
|
# Create another handful of refs to cross the border.
|
|
# Note that we explicitly do not check for strict
|
|
# boundaries here, as this also depends on the size of
|
|
# the object hash.
|
|
test_seq -f "create refs/heads/addn-%d HEAD" 10 |
|
|
git update-ref --stdin &&
|
|
git ${pack_refs} --auto --all &&
|
|
test_line_count = 135 .git/packed-refs
|
|
)
|
|
'
|
|
done
|
|
|
|
test_expect_success 'pack-refs does not store invalid peeled tag value' '
|
|
test_when_finished rm -rf repo &&
|
|
git init repo &&
|
|
(
|
|
cd repo &&
|
|
git commit --allow-empty --message initial &&
|
|
|
|
echo garbage >blob-content &&
|
|
blob_id=$(git hash-object -w -t blob blob-content) &&
|
|
|
|
# Write an invalid tag into the object database. The tag itself
|
|
# is well-formed, but the tagged object is a blob while we
|
|
# claim that it is a commit.
|
|
cat >tag-content <<-EOF &&
|
|
object $blob_id
|
|
type commit
|
|
tag bad-tag
|
|
tagger C O Mitter <committer@example.com> 1112354055 +0200
|
|
|
|
annotated
|
|
EOF
|
|
tag_id=$(git hash-object -w -t tag tag-content) &&
|
|
git update-ref refs/tags/bad-tag "$tag_id" &&
|
|
|
|
# The packed-refs file should not contain the peeled object ID.
|
|
# If it did this would cause commands that use the peeled value
|
|
# to not notice this corrupted tag.
|
|
git pack-refs --all &&
|
|
test_grep ! "^\^" .git/packed-refs
|
|
)
|
|
'
|