mirror of
https://github.com/git/git
synced 2024-11-04 16:17:49 +00:00
25d59524bb
In 4dc16e2cb0
(gc: introduce `gc.recentObjectsHook`, 2023-06-07), we
added tests to ensure that prune-able (i.e. unreachable and with mtime
older than the cutoff) objects which are marked as recent via the new
`gc.recentObjectsHook` configuration are unpacked as loose with
`--unpack-unreachable`.
In that test, we also ensure that objects which are reachable from other
unreachable objects which were *not* pruned are kept as well, regardless
of their mtimes. For this, we use an annotated tag pointing at a blob
($obj2) which would otherwise be pruned.
But after pruning, that object is kept around for two reasons. One, the
tag object's mtime wasn't adjusted to be beyond the 1-hour cutoff, so it
would be kept as due to its recency regardless. The other reason is
because the tag itself is reachable.
Use mktag to write the tag object directly without pointing a reference
at it, and adjust the mtime of the tag object to be older than the
cutoff to ensure that our `gc.recentObjectsHook` configuration is
working as intended.
Noticed-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
199 lines
5.9 KiB
Bash
Executable file
199 lines
5.9 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git repack works correctly'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
fsha1=
|
|
csha1=
|
|
tsha1=
|
|
|
|
test_expect_success '-A with -d option leaves unreachable objects unpacked' '
|
|
echo content > file1 &&
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m initial_commit &&
|
|
# create a transient branch with unique content
|
|
git checkout -b transient_branch &&
|
|
echo more content >> file1 &&
|
|
# record the objects created in the database for file, commit, tree
|
|
fsha1=$(git hash-object file1) &&
|
|
test_tick &&
|
|
git commit -a -m more_content &&
|
|
csha1=$(git rev-parse HEAD^{commit}) &&
|
|
tsha1=$(git rev-parse HEAD^{tree}) &&
|
|
git checkout main &&
|
|
echo even more content >> file1 &&
|
|
test_tick &&
|
|
git commit -a -m even_more_content &&
|
|
# delete the transient branch
|
|
git branch -D transient_branch &&
|
|
# pack the repo
|
|
git repack -A -d -l &&
|
|
# verify objects are packed in repository
|
|
test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx |
|
|
grep -E "^($fsha1|$csha1|$tsha1) " |
|
|
sort | uniq | wc -l) &&
|
|
git show $fsha1 &&
|
|
git show $csha1 &&
|
|
git show $tsha1 &&
|
|
# now expire the reflog, while keeping reachable ones but expiring
|
|
# unreachables immediately
|
|
test_tick &&
|
|
sometimeago=$(( $test_tick - 10000 )) &&
|
|
git reflog expire --expire=$sometimeago --expire-unreachable=$test_tick --all &&
|
|
# and repack
|
|
git repack -A -d -l &&
|
|
# verify objects are retained unpacked
|
|
test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
|
|
grep -E "^($fsha1|$csha1|$tsha1) " |
|
|
sort | uniq | wc -l) &&
|
|
git show $fsha1 &&
|
|
git show $csha1 &&
|
|
git show $tsha1
|
|
'
|
|
|
|
compare_mtimes ()
|
|
{
|
|
read tref &&
|
|
while read t; do
|
|
test "$tref" = "$t" || return 1
|
|
done
|
|
}
|
|
|
|
test_expect_success '-A without -d option leaves unreachable objects packed' '
|
|
fsha1path=$(echo "$fsha1" | sed -e "s|\(..\)|\1/|") &&
|
|
fsha1path=".git/objects/$fsha1path" &&
|
|
csha1path=$(echo "$csha1" | sed -e "s|\(..\)|\1/|") &&
|
|
csha1path=".git/objects/$csha1path" &&
|
|
tsha1path=$(echo "$tsha1" | sed -e "s|\(..\)|\1/|") &&
|
|
tsha1path=".git/objects/$tsha1path" &&
|
|
git branch transient_branch $csha1 &&
|
|
git repack -a -d -l &&
|
|
test ! -f "$fsha1path" &&
|
|
test ! -f "$csha1path" &&
|
|
test ! -f "$tsha1path" &&
|
|
test 1 = $(ls -1 .git/objects/pack/pack-*.pack | wc -l) &&
|
|
packfile=$(ls .git/objects/pack/pack-*.pack) &&
|
|
git branch -D transient_branch &&
|
|
test_tick &&
|
|
git repack -A -l &&
|
|
test ! -f "$fsha1path" &&
|
|
test ! -f "$csha1path" &&
|
|
test ! -f "$tsha1path" &&
|
|
git show $fsha1 &&
|
|
git show $csha1 &&
|
|
git show $tsha1
|
|
'
|
|
|
|
test_expect_success 'unpacked objects receive timestamp of pack file' '
|
|
tmppack=".git/objects/pack/tmp_pack" &&
|
|
ln "$packfile" "$tmppack" &&
|
|
git repack -A -l -d &&
|
|
test-tool chmtime --get "$tmppack" "$fsha1path" "$csha1path" "$tsha1path" \
|
|
> mtimes &&
|
|
compare_mtimes < mtimes
|
|
'
|
|
|
|
test_expect_success 'do not bother loosening old objects' '
|
|
obj1=$(echo one | git hash-object -w --stdin) &&
|
|
obj2=$(echo two | git hash-object -w --stdin) &&
|
|
pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
|
|
pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
|
|
git prune-packed &&
|
|
git cat-file -p $obj1 &&
|
|
git cat-file -p $obj2 &&
|
|
test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
|
|
git repack -A -d --unpack-unreachable=1.hour.ago &&
|
|
git cat-file -p $obj1 &&
|
|
test_must_fail git cat-file -p $obj2
|
|
'
|
|
|
|
test_expect_success 'gc.recentObjectsHook' '
|
|
obj1=$(echo one | git hash-object -w --stdin) &&
|
|
obj2=$(echo two | git hash-object -w --stdin) &&
|
|
obj3=$(echo three | git hash-object -w --stdin) &&
|
|
pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
|
|
pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
|
|
pack3=$(echo $obj3 | git pack-objects .git/objects/pack/pack) &&
|
|
git prune-packed &&
|
|
|
|
git cat-file -p $obj1 &&
|
|
git cat-file -p $obj2 &&
|
|
git cat-file -p $obj3 &&
|
|
|
|
# make an unreachable annotated tag object to ensure we rescue objects
|
|
# which are reachable from non-pruned unreachable objects
|
|
obj2_tag="$(git mktag <<-EOF
|
|
object $obj2
|
|
type blob
|
|
tag obj2-tag
|
|
tagger T A Gger <tagger@example.com> 1234567890 -0000
|
|
EOF
|
|
)" &&
|
|
|
|
obj2_tag_pack="$(echo $obj2_tag | git pack-objects .git/objects/pack/pack)" &&
|
|
git prune-packed &&
|
|
|
|
write_script precious-objects <<-EOF &&
|
|
echo $obj2_tag
|
|
EOF
|
|
git config gc.recentObjectsHook ./precious-objects &&
|
|
|
|
test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
|
|
test-tool chmtime =-86400 .git/objects/pack/pack-$pack3.pack &&
|
|
test-tool chmtime =-86400 .git/objects/pack/pack-$obj2_tag_pack.pack &&
|
|
git repack -A -d --unpack-unreachable=1.hour.ago &&
|
|
|
|
git cat-file -p $obj1 &&
|
|
git cat-file -p $obj2 &&
|
|
git cat-file -p $obj2_tag &&
|
|
test_must_fail git cat-file -p $obj3
|
|
'
|
|
|
|
test_expect_success 'keep packed objects found only in index' '
|
|
echo my-unique-content >file &&
|
|
git add file &&
|
|
git commit -m "make it reachable" &&
|
|
git gc &&
|
|
git reset HEAD^ &&
|
|
git reflog expire --expire=now --all &&
|
|
git add file &&
|
|
test-tool chmtime =-86400 .git/objects/pack/* &&
|
|
git gc --prune=1.hour.ago &&
|
|
git cat-file blob :file
|
|
'
|
|
|
|
test_expect_success 'repack -k keeps unreachable packed objects' '
|
|
# create packed-but-unreachable object
|
|
sha1=$(echo unreachable-packed | git hash-object -w --stdin) &&
|
|
pack=$(echo $sha1 | git pack-objects .git/objects/pack/pack) &&
|
|
git prune-packed &&
|
|
|
|
# -k should keep it
|
|
git repack -adk &&
|
|
git cat-file -p $sha1 &&
|
|
|
|
# and double check that without -k it would have been removed
|
|
git repack -ad &&
|
|
test_must_fail git cat-file -p $sha1
|
|
'
|
|
|
|
test_expect_success 'repack -k packs unreachable loose objects' '
|
|
# create loose unreachable object
|
|
sha1=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
|
|
objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
|
|
test_path_is_file $objpath &&
|
|
|
|
# and confirm that the loose object goes away, but we can
|
|
# still access it (ergo, it is packed)
|
|
git repack -adk &&
|
|
test_path_is_missing $objpath &&
|
|
git cat-file -p $sha1
|
|
'
|
|
|
|
test_done
|