mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
a83c88525e
The ability to "...fatten [the] local repository by packing everything that is needed by the local ref into a single new pack, including things that are borrowed from alternates"[1] is supposed to be provided by the '-a' or '-A' options to repack when '-l' is not used, but there is a flaw. For each pack in the local repository without a .keep file, repack supplies a --unpacked=<pack> argument to pack-objects. The --unpacked option to pack-objects, with or without an argument, causes pack-objects to ignore any object which is packed in a pack not mentioned in an argument to --unpacked=. So, if there are local packs, and 'repack -a' is called, then any objects which reside in packs accessible through alternates will _not_ be packed. If there are no local packs, then no --unpacked argument will be supplied, and repack will behave as expected. [1] http://mid.gmane.org/7v8wrwidi3.fsf@gitster.siamese.dyndns.org Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
93 lines
2.6 KiB
Bash
Executable file
93 lines
2.6 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_failure '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_done
|
|
|