mirror of
https://github.com/git/git.git
synced 2024-12-12 11:24:02 +08:00
ed7e5fc3a2
We allow to keep existing packs by having companion .keep files. This is helpful when a pack is permanently kept. In the next patch, git-gc just wants to keep a pack temporarily, for one pack-objects run. git-gc can use --keep-pack for this use case. A note about why the pack_keep field cannot be reused and pack_keep_in_core has to be added. This is about the case when --keep-pack is specified together with either --keep-unreachable or --unpack-unreachable, but --honor-pack-keep is NOT specified. In this case, we want to exclude objects from the packs specified on command line, not from ones with .keep files. If only one bit flag is used, we have to clear pack_keep on pack files with the .keep file. But we can't make any assumption about unreachable objects in .keep packs. If "pack_keep" field is false for .keep packs, we could potentially pull lots of unreachable objects into the new pack, or unpack them loose. The safer approach is ignore all packs with either .keep file or --keep-pack. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
226 lines
6.9 KiB
Bash
Executable File
226 lines
6.9 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git repack works correctly'
|
|
|
|
. ./test-lib.sh
|
|
|
|
commit_and_pack() {
|
|
test_commit "$@" >/dev/null &&
|
|
SHA1=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) &&
|
|
echo pack-${SHA1}.pack
|
|
}
|
|
|
|
test_expect_success 'objects in packs marked .keep are not repacked' '
|
|
echo content1 > file1 &&
|
|
echo content2 > file2 &&
|
|
git add . &&
|
|
test_tick &&
|
|
git commit -m initial_commit &&
|
|
# Create two packs
|
|
# The first pack will contain all of the objects except one
|
|
git rev-list --objects --all | grep -v file2 |
|
|
git pack-objects pack > /dev/null &&
|
|
# The second pack will contain the excluded object
|
|
packsha1=$(git rev-list --objects --all | grep file2 |
|
|
git pack-objects pack) &&
|
|
>pack-$packsha1.keep &&
|
|
objsha1=$(git verify-pack -v pack-$packsha1.idx | head -n 1 |
|
|
sed -e "s/^\([0-9a-f]\{40\}\).*/\1/") &&
|
|
mv pack-* .git/objects/pack/ &&
|
|
git repack -A -d -l &&
|
|
git prune-packed &&
|
|
for p in .git/objects/pack/*.idx; do
|
|
idx=$(basename $p)
|
|
test "pack-$packsha1.idx" = "$idx" && continue
|
|
if git verify-pack -v $p | egrep "^$objsha1"; then
|
|
found_duplicate_object=1
|
|
echo "DUPLICATE OBJECT FOUND"
|
|
break
|
|
fi
|
|
done &&
|
|
test -z "$found_duplicate_object"
|
|
'
|
|
|
|
test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' '
|
|
# build on $objsha1, $packsha1, and .keep state from previous
|
|
git repack -Adbl &&
|
|
test_when_finished "found_duplicate_object=" &&
|
|
for p in .git/objects/pack/*.idx; do
|
|
idx=$(basename $p)
|
|
test "pack-$packsha1.idx" = "$idx" && continue
|
|
if git verify-pack -v $p | egrep "^$objsha1"; then
|
|
found_duplicate_object=1
|
|
echo "DUPLICATE OBJECT FOUND"
|
|
break
|
|
fi
|
|
done &&
|
|
test "$found_duplicate_object" = 1
|
|
'
|
|
|
|
test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
|
|
# build on $objsha1, $packsha1, and .keep state from previous
|
|
git -c repack.writebitmaps=true repack -Adl &&
|
|
test_when_finished "found_duplicate_object=" &&
|
|
for p in .git/objects/pack/*.idx; do
|
|
idx=$(basename $p)
|
|
test "pack-$packsha1.idx" = "$idx" && continue
|
|
if git verify-pack -v $p | egrep "^$objsha1"; then
|
|
found_duplicate_object=1
|
|
echo "DUPLICATE OBJECT FOUND"
|
|
break
|
|
fi
|
|
done &&
|
|
test "$found_duplicate_object" = 1
|
|
'
|
|
|
|
test_expect_success 'loose objects in alternate ODB are not repacked' '
|
|
mkdir alt_objects &&
|
|
echo $(pwd)/alt_objects > .git/objects/info/alternates &&
|
|
echo content3 > file3 &&
|
|
objsha1=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
|
|
git add file3 &&
|
|
test_tick &&
|
|
git commit -m commit_file3 &&
|
|
git repack -a -d -l &&
|
|
git prune-packed &&
|
|
for p in .git/objects/pack/*.idx; do
|
|
if git verify-pack -v $p | egrep "^$objsha1"; then
|
|
found_duplicate_object=1
|
|
echo "DUPLICATE OBJECT FOUND"
|
|
break
|
|
fi
|
|
done &&
|
|
test -z "$found_duplicate_object"
|
|
'
|
|
|
|
test_expect_success 'packed obs in alt ODB are repacked even when local repo is packless' '
|
|
mkdir alt_objects/pack &&
|
|
mv .git/objects/pack/* alt_objects/pack &&
|
|
git repack -a &&
|
|
myidx=$(ls -1 .git/objects/pack/*.idx) &&
|
|
test -f "$myidx" &&
|
|
for p in alt_objects/pack/*.idx; do
|
|
git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
|
|
done | while read sha1 rest; do
|
|
if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
|
|
echo "Missing object in local pack: $sha1"
|
|
return 1
|
|
fi
|
|
done
|
|
'
|
|
|
|
test_expect_success 'packed obs in alt ODB are repacked when local repo has packs' '
|
|
rm -f .git/objects/pack/* &&
|
|
echo new_content >> file1 &&
|
|
git add file1 &&
|
|
test_tick &&
|
|
git commit -m more_content &&
|
|
git repack &&
|
|
git repack -a -d &&
|
|
myidx=$(ls -1 .git/objects/pack/*.idx) &&
|
|
test -f "$myidx" &&
|
|
for p in alt_objects/pack/*.idx; do
|
|
git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
|
|
done | while read sha1 rest; do
|
|
if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
|
|
echo "Missing object in local pack: $sha1"
|
|
return 1
|
|
fi
|
|
done
|
|
'
|
|
|
|
test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
|
|
# swap the .keep so the commit object is in the pack with .keep
|
|
for p in alt_objects/pack/*.pack
|
|
do
|
|
base_name=$(basename $p .pack) &&
|
|
if test -f alt_objects/pack/$base_name.keep
|
|
then
|
|
rm alt_objects/pack/$base_name.keep
|
|
else
|
|
touch alt_objects/pack/$base_name.keep
|
|
fi
|
|
done &&
|
|
git repack -a -d &&
|
|
myidx=$(ls -1 .git/objects/pack/*.idx) &&
|
|
test -f "$myidx" &&
|
|
for p in alt_objects/pack/*.idx; do
|
|
git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
|
|
done | while read sha1 rest; do
|
|
if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
|
|
echo "Missing object in local pack: $sha1"
|
|
return 1
|
|
fi
|
|
done
|
|
'
|
|
|
|
test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
|
|
rm -f alt_objects/pack/*.keep &&
|
|
mv .git/objects/pack/* alt_objects/pack/ &&
|
|
csha1=$(git rev-parse HEAD^{commit}) &&
|
|
git reset --hard HEAD^ &&
|
|
test_tick &&
|
|
git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
|
|
# The pack-objects call on the next line is equivalent to
|
|
# git repack -A -d without the call to prune-packed
|
|
git pack-objects --honor-pack-keep --non-empty --all --reflog \
|
|
--unpack-unreachable </dev/null pack &&
|
|
rm -f .git/objects/pack/* &&
|
|
mv pack-* .git/objects/pack/ &&
|
|
test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
|
|
egrep "^$csha1 " | sort | uniq | wc -l) &&
|
|
echo > .git/objects/info/alternates &&
|
|
test_must_fail git show $csha1
|
|
'
|
|
|
|
test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' '
|
|
echo $(pwd)/alt_objects > .git/objects/info/alternates &&
|
|
echo "$csha1" | git pack-objects --non-empty --all --reflog pack &&
|
|
rm -f .git/objects/pack/* &&
|
|
mv pack-* .git/objects/pack/ &&
|
|
# The pack-objects call on the next line is equivalent to
|
|
# git repack -A -d without the call to prune-packed
|
|
git pack-objects --honor-pack-keep --non-empty --all --reflog \
|
|
--unpack-unreachable </dev/null pack &&
|
|
rm -f .git/objects/pack/* &&
|
|
mv pack-* .git/objects/pack/ &&
|
|
test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
|
|
egrep "^$csha1 " | sort | uniq | wc -l) &&
|
|
echo > .git/objects/info/alternates &&
|
|
test_must_fail git show $csha1
|
|
'
|
|
|
|
test_expect_success 'objects made unreachable by grafts only are kept' '
|
|
test_tick &&
|
|
git commit --allow-empty -m "commit 4" &&
|
|
H0=$(git rev-parse HEAD) &&
|
|
H1=$(git rev-parse HEAD^) &&
|
|
H2=$(git rev-parse HEAD^^) &&
|
|
echo "$H0 $H2" > .git/info/grafts &&
|
|
git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
|
|
git repack -a -d &&
|
|
git cat-file -t $H1
|
|
'
|
|
|
|
test_expect_success 'repack --keep-pack' '
|
|
test_create_repo keep-pack &&
|
|
(
|
|
cd keep-pack &&
|
|
P1=$(commit_and_pack 1) &&
|
|
P2=$(commit_and_pack 2) &&
|
|
P3=$(commit_and_pack 3) &&
|
|
P4=$(commit_and_pack 4) &&
|
|
ls .git/objects/pack/*.pack >old-counts &&
|
|
test_line_count = 4 old-counts &&
|
|
git repack -a -d --keep-pack $P1 --keep-pack $P4 &&
|
|
ls .git/objects/pack/*.pack >new-counts &&
|
|
grep -q $P1 new-counts &&
|
|
grep -q $P4 new-counts &&
|
|
test_line_count = 3 new-counts &&
|
|
git fsck
|
|
)
|
|
'
|
|
|
|
test_done
|
|
|