mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
7f3140cd23
When you have grafts that pretend that a given commit has different parents than the ones recorded in the commit object, it is dangerous to let 'git repack' remove those hidden parents, as you can easily remove the graft and end up with a broken repository. So let's play it safe and keep those parent objects and everything that is reachable by them, in addition to the grafted parents. As this behavior can only be triggered by git pack-objects, and as that command handles duplicate parents gracefully, we do not bother to cull duplicated parents that may result by using both true and grafted parents. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
165 lines
5.2 KiB
Bash
Executable file
165 lines
5.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git repack works correctly'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'objects in packs marked .keep are not repacked' '
|
|
echo content1 > file1 &&
|
|
echo content2 > file2 &&
|
|
git add . &&
|
|
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) &&
|
|
touch -r pack-$packsha1.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 '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 &&
|
|
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 &&
|
|
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^ &&
|
|
sleep 1 &&
|
|
git reflog expire --expire=now --expire-unreachable=now --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=now --expire-unreachable=now --all &&
|
|
git repack -a -d &&
|
|
git cat-file -t $H1
|
|
'
|
|
|
|
test_done
|
|
|