mirror of
https://github.com/git/git
synced 2024-07-17 02:57:48 +00:00
b1df3b3867
In7a5d604443(commit: detect commits that exist in commit-graph but not in the ODB, 2023-10-31), we have introduced a new object existence check into `repo_parse_commit_internal()` so that we do not parse commits via the commit-graph that don't have a corresponding object in the object database. This new check of course comes with a performance penalty, which the commit put at around 30% for `git rev-list --topo-order`. But there are in fact scenarios where the performance regression is even higher. The following benchmark against linux.git with a fully-build commit-graph: Benchmark 1: git.v2.42.1 rev-list --count HEAD Time (mean ± σ): 658.0 ms ± 5.2 ms [User: 613.5 ms, System: 44.4 ms] Range (min … max): 650.2 ms … 666.0 ms 10 runs Benchmark 2: git.v2.43.0-rc1 rev-list --count HEAD Time (mean ± σ): 1.333 s ± 0.019 s [User: 1.263 s, System: 0.069 s] Range (min … max): 1.302 s … 1.361 s 10 runs Summary git.v2.42.1 rev-list --count HEAD ran 2.03 ± 0.03 times faster than git.v2.43.0-rc1 rev-list --count HEAD While it's a noble goal to ensure that results are the same regardless of whether or not we have a potentially stale commit-graph, taking twice as much time is a tough sell. Furthermore, we can generally assume that the commit-graph will be updated by git-gc(1) or git-maintenance(1) as required so that the case where the commit-graph is stale should not at all be common. With that in mind, default-disable GIT_COMMIT_GRAPH_PARANOIA and restore the behaviour and thus performance previous to the mentioned commit. In order to not be inconsistent, also disable this behaviour by default in `lookup_commit_in_graph()`, where the object existence check has been introduced right at its inception viaf559d6d45e(revision: avoid hitting packfiles when commits are in commit-graph, 2021-08-09). This results in another speedup in commands that end up calling this function, even though it's less pronounced compared to the above benchmark. The following has been executed in linux.git with ~1.2 million references: Benchmark 1: GIT_COMMIT_GRAPH_PARANOIA=true git rev-list --all --no-walk=unsorted Time (mean ± σ): 2.947 s ± 0.003 s [User: 2.412 s, System: 0.534 s] Range (min … max): 2.943 s … 2.949 s 3 runs Benchmark 2: GIT_COMMIT_GRAPH_PARANOIA=false git rev-list --all --no-walk=unsorted Time (mean ± σ): 2.724 s ± 0.030 s [User: 2.207 s, System: 0.514 s] Range (min … max): 2.704 s … 2.759 s 3 runs Summary GIT_COMMIT_GRAPH_PARANOIA=false git rev-list --all --no-walk=unsorted ran 1.08 ± 0.01 times faster than GIT_COMMIT_GRAPH_PARANOIA=true git rev-list --all --no-walk=unsorted So whereas7a5d604443initially introduced the logic to start doing an object existence check in `repo_parse_commit_internal()` by default, the updated logic will now instead cause `lookup_commit_in_graph()` to stop doing the check by default. This behaviour continues to be tweakable by the user via the GIT_COMMIT_GRAPH_PARANOIA environment variable. Note that this requires us to amend some tests to manually turn on the paranoid checks again. This is because we cause repository corruption by manually deleting objects which are part of the commit graph already. These circumstances shouldn't usually happen in repositories. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
834 lines
25 KiB
Bash
Executable file
834 lines
25 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git repack works correctly'
|
|
|
|
. ./test-lib.sh
|
|
. "${TEST_DIRECTORY}/lib-bitmap.sh"
|
|
. "${TEST_DIRECTORY}/lib-midx.sh"
|
|
. "${TEST_DIRECTORY}/lib-terminal.sh"
|
|
|
|
commit_and_pack () {
|
|
test_commit "$@" 1>&2 &&
|
|
incrpackid=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) &&
|
|
# Remove any loose object(s) created by test_commit, since they have
|
|
# already been packed. Leaving these around can create subtly different
|
|
# packs with `pack-objects`'s `--unpacked` option.
|
|
git prune-packed 1>&2 &&
|
|
echo pack-${incrpackid}.pack
|
|
}
|
|
|
|
test_no_missing_in_packs () {
|
|
myidx=$(ls -1 .git/objects/pack/*.idx) &&
|
|
test_path_is_file "$myidx" &&
|
|
git verify-pack -v alt_objects/pack/*.idx >orig.raw &&
|
|
sed -n -e "s/^\($OID_REGEX\).*/\1/p" orig.raw | sort >orig &&
|
|
git verify-pack -v $myidx >dest.raw &&
|
|
cut -d" " -f1 dest.raw | sort >dest &&
|
|
comm -23 orig dest >missing &&
|
|
test_must_be_empty missing
|
|
}
|
|
|
|
# we expect $packid and $oid to be defined
|
|
test_has_duplicate_object () {
|
|
want_duplicate_object="$1"
|
|
found_duplicate_object=false
|
|
for p in .git/objects/pack/*.idx
|
|
do
|
|
idx=$(basename $p)
|
|
test "pack-$packid.idx" = "$idx" && continue
|
|
git verify-pack -v $p >packlist || return $?
|
|
if grep "^$oid" packlist
|
|
then
|
|
found_duplicate_object=true
|
|
echo "DUPLICATE OBJECT FOUND"
|
|
break
|
|
fi
|
|
done &&
|
|
test "$want_duplicate_object" = "$found_duplicate_object"
|
|
}
|
|
|
|
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 >objs &&
|
|
grep -v file2 objs | git pack-objects pack &&
|
|
# The second pack will contain the excluded object
|
|
packid=$(grep file2 objs | git pack-objects pack) &&
|
|
>pack-$packid.keep &&
|
|
git verify-pack -v pack-$packid.idx >packlist &&
|
|
oid=$(head -n 1 packlist | sed -e "s/^\($OID_REGEX\).*/\1/") &&
|
|
mv pack-* .git/objects/pack/ &&
|
|
git repack -A -d -l &&
|
|
git prune-packed &&
|
|
test_has_duplicate_object false
|
|
'
|
|
|
|
test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' '
|
|
# build on $oid, $packid, and .keep state from previous
|
|
GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 git repack -Adbl &&
|
|
test_has_duplicate_object true
|
|
'
|
|
|
|
test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
|
|
# build on $oid, $packid, and .keep state from previous
|
|
GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
|
|
git -c repack.writebitmaps=true repack -Adl &&
|
|
test_has_duplicate_object true
|
|
'
|
|
|
|
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 &&
|
|
oid=$(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 &&
|
|
test_has_duplicate_object false
|
|
'
|
|
|
|
test_expect_success SYMLINKS '--local keeps packs when alternate is objectdir ' '
|
|
test_when_finished "rm -rf repo" &&
|
|
git init repo &&
|
|
test_commit -C repo A &&
|
|
(
|
|
cd repo &&
|
|
git repack -a &&
|
|
ls .git/objects/pack/*.pack >../expect &&
|
|
ln -s objects .git/alt_objects &&
|
|
echo "$(pwd)/.git/alt_objects" >.git/objects/info/alternates &&
|
|
git repack -a -d -l &&
|
|
ls .git/objects/pack/*.pack >../actual
|
|
) &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--local disables writing bitmaps when connected to alternate ODB' '
|
|
test_when_finished "rm -rf shared member" &&
|
|
|
|
git init shared &&
|
|
git clone --shared shared member &&
|
|
(
|
|
cd member &&
|
|
test_commit "object" &&
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adl --write-bitmap-index 2>err &&
|
|
cat >expect <<-EOF &&
|
|
warning: disabling bitmap writing, as some objects are not being packed
|
|
EOF
|
|
test_cmp expect err &&
|
|
test_path_is_missing .git/objects/pack-*.bitmap
|
|
)
|
|
'
|
|
|
|
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 &&
|
|
test_no_missing_in_packs
|
|
'
|
|
|
|
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 &&
|
|
test_no_missing_in_packs
|
|
'
|
|
|
|
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_path_is_file alt_objects/pack/$base_name.keep
|
|
then
|
|
rm alt_objects/pack/$base_name.keep
|
|
else
|
|
touch alt_objects/pack/$base_name.keep
|
|
fi || return 1
|
|
done &&
|
|
git repack -a -d &&
|
|
test_no_missing_in_packs
|
|
'
|
|
|
|
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/ &&
|
|
coid=$(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/ &&
|
|
git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
|
|
! grep "^$coid " packlist &&
|
|
echo >.git/objects/info/alternates &&
|
|
test_must_fail git show $coid
|
|
'
|
|
|
|
test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' '
|
|
echo $(pwd)/alt_objects >.git/objects/info/alternates &&
|
|
echo "$coid" | 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/ &&
|
|
git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
|
|
! grep "^$coid " &&
|
|
echo >.git/objects/info/alternates &&
|
|
test_must_fail git show $coid
|
|
'
|
|
|
|
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 &&
|
|
# avoid producing different packs due to delta/base choices
|
|
git config pack.window 0 &&
|
|
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 &&
|
|
|
|
P5=$(commit_and_pack --no-tag 5) &&
|
|
git reset --hard HEAD^ &&
|
|
git reflog expire --all --expire=all &&
|
|
rm -f ".git/objects/pack/${P5%.pack}.idx" &&
|
|
rm -f ".git/objects/info/commit-graph" &&
|
|
for from in $(find .git/objects/pack -type f -name "${P5%.pack}.*")
|
|
do
|
|
to="$(dirname "$from")/.tmp-1234-$(basename "$from")" &&
|
|
mv "$from" "$to" || return 1
|
|
done &&
|
|
|
|
# A .idx file without a .pack should not stop us from
|
|
# repacking what we can.
|
|
touch .git/objects/pack/pack-does-not-exist.idx &&
|
|
|
|
git repack --cruft -d --keep-pack $P1 --keep-pack $P4 &&
|
|
|
|
ls .git/objects/pack/*.pack >newer-counts &&
|
|
test_cmp new-counts newer-counts &&
|
|
git fsck
|
|
)
|
|
'
|
|
|
|
test_expect_success 'repacking fails when missing .pack actually means missing objects' '
|
|
test_create_repo idx-without-pack &&
|
|
(
|
|
cd idx-without-pack &&
|
|
|
|
# Avoid producing different packs due to delta/base choices
|
|
git config pack.window 0 &&
|
|
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 &&
|
|
|
|
# Remove one .pack file
|
|
rm .git/objects/pack/$P2 &&
|
|
|
|
ls .git/objects/pack/*.pack >before-pack-dir &&
|
|
|
|
test_must_fail git fsck &&
|
|
test_must_fail env GIT_COMMIT_GRAPH_PARANOIA=true git repack --cruft -d 2>err &&
|
|
grep "bad object" err &&
|
|
|
|
# Before failing, the repack did not modify the
|
|
# pack directory.
|
|
ls .git/objects/pack/*.pack >after-pack-dir &&
|
|
test_cmp before-pack-dir after-pack-dir
|
|
)
|
|
'
|
|
|
|
test_expect_success 'bitmaps are created by default in bare repos' '
|
|
git clone --bare .git bare.git &&
|
|
rm -f bare.git/objects/pack/*.bitmap &&
|
|
GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
|
|
git -C bare.git repack -ad &&
|
|
bitmap=$(ls bare.git/objects/pack/*.bitmap) &&
|
|
test_path_is_file "$bitmap"
|
|
'
|
|
|
|
test_expect_success 'incremental repack does not complain' '
|
|
git -C bare.git repack -q 2>repack.err &&
|
|
test_must_be_empty repack.err
|
|
'
|
|
|
|
test_expect_success 'bitmaps can be disabled on bare repos' '
|
|
GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
|
|
git -c repack.writeBitmaps=false -C bare.git repack -ad &&
|
|
bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
|
|
test -z "$bitmap"
|
|
'
|
|
|
|
test_expect_success 'no bitmaps created if .keep files present' '
|
|
pack=$(ls bare.git/objects/pack/*.pack) &&
|
|
test_path_is_file "$pack" &&
|
|
keep=${pack%.pack}.keep &&
|
|
test_when_finished "rm -f \"\$keep\"" &&
|
|
>"$keep" &&
|
|
GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
|
|
git -C bare.git repack -ad 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'auto-bitmaps do not complain if unavailable' '
|
|
test_config -C bare.git pack.packSizeLimit 1M &&
|
|
blob=$(test-tool genrandom big $((1024*1024)) |
|
|
git -C bare.git hash-object -w --stdin) &&
|
|
git -C bare.git update-ref refs/tags/big $blob &&
|
|
GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
|
|
git -C bare.git repack -ad 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'repacking with a filter works' '
|
|
git -C bare.git repack -a -d &&
|
|
test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
|
|
git -C bare.git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
|
|
test_stdout_line_count = 2 ls bare.git/objects/pack/*.pack &&
|
|
commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
|
|
blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
|
|
test "$commit_pack" != "$blob_pack" &&
|
|
tree_pack=$(test-tool -C bare.git find-pack -c 1 HEAD^{tree}) &&
|
|
test "$tree_pack" = "$commit_pack" &&
|
|
blob_pack2=$(test-tool -C bare.git find-pack -c 1 HEAD:file2) &&
|
|
test "$blob_pack2" = "$blob_pack"
|
|
'
|
|
|
|
test_expect_success '--filter fails with --write-bitmap-index' '
|
|
test_must_fail \
|
|
env GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 \
|
|
git -C bare.git repack -a -d --write-bitmap-index --filter=blob:none
|
|
'
|
|
|
|
test_expect_success 'repacking with two filters works' '
|
|
git init two-filters &&
|
|
(
|
|
cd two-filters &&
|
|
mkdir subdir &&
|
|
test_commit foo &&
|
|
test_commit subdir_bar subdir/bar &&
|
|
test_commit subdir_baz subdir/baz
|
|
) &&
|
|
git clone --no-local --bare two-filters two-filters.git &&
|
|
(
|
|
cd two-filters.git &&
|
|
test_stdout_line_count = 1 ls objects/pack/*.pack &&
|
|
git -c repack.writebitmaps=false repack -a -d \
|
|
--filter=blob:none --filter=tree:1 &&
|
|
test_stdout_line_count = 2 ls objects/pack/*.pack &&
|
|
commit_pack=$(test-tool find-pack -c 1 HEAD) &&
|
|
blob_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
|
|
root_tree_pack=$(test-tool find-pack -c 1 HEAD^{tree}) &&
|
|
subdir_tree_hash=$(git ls-tree --object-only HEAD -- subdir) &&
|
|
subdir_tree_pack=$(test-tool find-pack -c 1 "$subdir_tree_hash") &&
|
|
|
|
# Root tree and subdir tree are not in the same packfiles
|
|
test "$commit_pack" != "$blob_pack" &&
|
|
test "$commit_pack" = "$root_tree_pack" &&
|
|
test "$blob_pack" = "$subdir_tree_pack"
|
|
)
|
|
'
|
|
|
|
prepare_for_keep_packs () {
|
|
git init keep-packs &&
|
|
(
|
|
cd keep-packs &&
|
|
test_commit foo &&
|
|
test_commit bar
|
|
) &&
|
|
git clone --no-local --bare keep-packs keep-packs.git &&
|
|
(
|
|
cd keep-packs.git &&
|
|
|
|
# Create two packs
|
|
# The first pack will contain all of the objects except one blob
|
|
git rev-list --objects --all >objs &&
|
|
grep -v "bar.t" objs | git pack-objects pack &&
|
|
# The second pack will contain the excluded object and be kept
|
|
packid=$(grep "bar.t" objs | git pack-objects pack) &&
|
|
>pack-$packid.keep &&
|
|
|
|
# Replace the existing pack with the 2 new ones
|
|
rm -f objects/pack/pack* &&
|
|
mv pack-* objects/pack/
|
|
)
|
|
}
|
|
|
|
test_expect_success '--filter works with .keep packs' '
|
|
prepare_for_keep_packs &&
|
|
(
|
|
cd keep-packs.git &&
|
|
|
|
foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
|
|
bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
|
|
head_pack=$(test-tool find-pack -c 1 HEAD) &&
|
|
|
|
test "$foo_pack" != "$bar_pack" &&
|
|
test "$foo_pack" = "$head_pack" &&
|
|
|
|
git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
|
|
|
|
foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
|
|
bar_pack_1=$(test-tool find-pack -c 1 HEAD:bar.t) &&
|
|
head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
|
|
|
|
# Object bar is still only in the old .keep pack
|
|
test "$foo_pack_1" != "$foo_pack" &&
|
|
test "$bar_pack_1" = "$bar_pack" &&
|
|
test "$head_pack_1" != "$head_pack" &&
|
|
|
|
test "$foo_pack_1" != "$bar_pack_1" &&
|
|
test "$foo_pack_1" != "$head_pack_1" &&
|
|
test "$bar_pack_1" != "$head_pack_1"
|
|
)
|
|
'
|
|
|
|
test_expect_success '--filter works with --pack-kept-objects and .keep packs' '
|
|
rm -rf keep-packs keep-packs.git &&
|
|
prepare_for_keep_packs &&
|
|
(
|
|
cd keep-packs.git &&
|
|
|
|
foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
|
|
bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
|
|
head_pack=$(test-tool find-pack -c 1 HEAD) &&
|
|
|
|
test "$foo_pack" != "$bar_pack" &&
|
|
test "$foo_pack" = "$head_pack" &&
|
|
|
|
git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
|
|
--pack-kept-objects &&
|
|
|
|
foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
|
|
test-tool find-pack -c 2 HEAD:bar.t >bar_pack_1 &&
|
|
head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
|
|
|
|
test "$foo_pack_1" != "$foo_pack" &&
|
|
test "$foo_pack_1" != "$bar_pack" &&
|
|
test "$head_pack_1" != "$head_pack" &&
|
|
|
|
# Object bar is in both the old .keep pack and the new
|
|
# pack that contained the filtered out objects
|
|
grep "$bar_pack" bar_pack_1 &&
|
|
grep "$foo_pack_1" bar_pack_1 &&
|
|
test "$foo_pack_1" != "$head_pack_1"
|
|
)
|
|
'
|
|
|
|
test_expect_success '--filter-to stores filtered out objects' '
|
|
git -C bare.git repack -a -d &&
|
|
test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
|
|
|
|
git init --bare filtered.git &&
|
|
git -C bare.git -c repack.writebitmaps=false repack -a -d \
|
|
--filter=blob:none \
|
|
--filter-to=../filtered.git/objects/pack/pack &&
|
|
test_stdout_line_count = 1 ls bare.git/objects/pack/pack-*.pack &&
|
|
test_stdout_line_count = 1 ls filtered.git/objects/pack/pack-*.pack &&
|
|
|
|
commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
|
|
blob_pack=$(test-tool -C bare.git find-pack -c 0 HEAD:file1) &&
|
|
blob_hash=$(git -C bare.git rev-parse HEAD:file1) &&
|
|
test -n "$blob_hash" &&
|
|
blob_pack=$(test-tool -C filtered.git find-pack -c 1 $blob_hash) &&
|
|
|
|
echo $(pwd)/filtered.git/objects >bare.git/objects/info/alternates &&
|
|
blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
|
|
blob_content=$(git -C bare.git show $blob_hash) &&
|
|
test "$blob_content" = "content1"
|
|
'
|
|
|
|
test_expect_success '--filter works with --max-pack-size' '
|
|
rm -rf filtered.git &&
|
|
git init --bare filtered.git &&
|
|
git init max-pack-size &&
|
|
(
|
|
cd max-pack-size &&
|
|
test_commit base &&
|
|
# two blobs which exceed the maximum pack size
|
|
test-tool genrandom foo 1048576 >foo &&
|
|
git hash-object -w foo &&
|
|
test-tool genrandom bar 1048576 >bar &&
|
|
git hash-object -w bar &&
|
|
git add foo bar &&
|
|
git commit -m "adding foo and bar"
|
|
) &&
|
|
git clone --no-local --bare max-pack-size max-pack-size.git &&
|
|
(
|
|
cd max-pack-size.git &&
|
|
git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
|
|
--max-pack-size=1M \
|
|
--filter-to=../filtered.git/objects/pack/pack &&
|
|
echo $(cd .. && pwd)/filtered.git/objects >objects/info/alternates &&
|
|
|
|
# Check that the 3 blobs are in different packfiles in filtered.git
|
|
test_stdout_line_count = 3 ls ../filtered.git/objects/pack/pack-*.pack &&
|
|
test_stdout_line_count = 1 ls objects/pack/pack-*.pack &&
|
|
foo_pack=$(test-tool find-pack -c 1 HEAD:foo) &&
|
|
bar_pack=$(test-tool find-pack -c 1 HEAD:bar) &&
|
|
base_pack=$(test-tool find-pack -c 1 HEAD:base.t) &&
|
|
test "$foo_pack" != "$bar_pack" &&
|
|
test "$foo_pack" != "$base_pack" &&
|
|
test "$bar_pack" != "$base_pack" &&
|
|
for pack in "$foo_pack" "$bar_pack" "$base_pack"
|
|
do
|
|
case "$foo_pack" in */filtered.git/objects/pack/*) true ;; *) return 1 ;; esac
|
|
done
|
|
)
|
|
'
|
|
|
|
objdir=.git/objects
|
|
midx=$objdir/pack/multi-pack-index
|
|
|
|
test_expect_success 'setup for --write-midx tests' '
|
|
git init midx &&
|
|
(
|
|
cd midx &&
|
|
git config core.multiPackIndex true &&
|
|
|
|
test_commit base
|
|
)
|
|
'
|
|
|
|
test_expect_success '--write-midx unchanged' '
|
|
(
|
|
cd midx &&
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack &&
|
|
test_path_is_missing $midx &&
|
|
test_path_is_missing $midx-*.bitmap &&
|
|
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack --write-midx &&
|
|
|
|
test_path_is_file $midx &&
|
|
test_path_is_missing $midx-*.bitmap &&
|
|
test_midx_consistent $objdir
|
|
)
|
|
'
|
|
|
|
test_expect_success '--write-midx with a new pack' '
|
|
(
|
|
cd midx &&
|
|
test_commit loose &&
|
|
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack --write-midx &&
|
|
|
|
test_path_is_file $midx &&
|
|
test_path_is_missing $midx-*.bitmap &&
|
|
test_midx_consistent $objdir
|
|
)
|
|
'
|
|
|
|
test_expect_success '--write-midx with -b' '
|
|
(
|
|
cd midx &&
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack -mb &&
|
|
|
|
test_path_is_file $midx &&
|
|
test_path_is_file $midx-*.bitmap &&
|
|
test_midx_consistent $objdir
|
|
)
|
|
'
|
|
|
|
test_expect_success '--write-midx with -d' '
|
|
(
|
|
cd midx &&
|
|
test_commit repack &&
|
|
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack -Ad --write-midx &&
|
|
|
|
test_path_is_file $midx &&
|
|
test_path_is_missing $midx-*.bitmap &&
|
|
test_midx_consistent $objdir
|
|
)
|
|
'
|
|
|
|
test_expect_success 'cleans up MIDX when appropriate' '
|
|
(
|
|
cd midx &&
|
|
|
|
test_commit repack-2 &&
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb --write-midx &&
|
|
|
|
checksum=$(midx_checksum $objdir) &&
|
|
test_path_is_file $midx &&
|
|
test_path_is_file $midx-$checksum.bitmap &&
|
|
|
|
test_commit repack-3 &&
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb --write-midx &&
|
|
|
|
test_path_is_file $midx &&
|
|
test_path_is_missing $midx-$checksum.bitmap &&
|
|
test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
|
|
|
|
test_commit repack-4 &&
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack -Adb &&
|
|
|
|
find $objdir/pack -type f -name "multi-pack-index*" >files &&
|
|
test_must_be_empty files
|
|
)
|
|
'
|
|
|
|
test_expect_success '--write-midx with preferred bitmap tips' '
|
|
git init midx-preferred-tips &&
|
|
test_when_finished "rm -fr midx-preferred-tips" &&
|
|
(
|
|
cd midx-preferred-tips &&
|
|
|
|
test_commit_bulk --message="%s" 103 &&
|
|
|
|
git log --format="%H" >commits.raw &&
|
|
sort <commits.raw >commits &&
|
|
|
|
git log --format="create refs/tags/%s/%s %H" HEAD >refs &&
|
|
git update-ref --stdin <refs &&
|
|
|
|
git repack --write-midx --write-bitmap-index &&
|
|
test_path_is_file $midx &&
|
|
test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
|
|
|
|
test-tool bitmap list-commits | sort >bitmaps &&
|
|
comm -13 bitmaps commits >before &&
|
|
test_line_count = 1 before &&
|
|
|
|
rm -fr $midx-$(midx_checksum $objdir).bitmap &&
|
|
rm -fr $midx &&
|
|
|
|
# instead of constructing the snapshot ourselves (c.f., the test
|
|
# "write a bitmap with --refs-snapshot (preferred tips)" in
|
|
# t5326), mark the missing commit as preferred by adding it to
|
|
# the pack.preferBitmapTips configuration.
|
|
git for-each-ref --format="%(refname:rstrip=1)" \
|
|
--points-at="$(cat before)" >missing &&
|
|
git config pack.preferBitmapTips "$(cat missing)" &&
|
|
git repack --write-midx --write-bitmap-index &&
|
|
|
|
test-tool bitmap list-commits | sort >bitmaps &&
|
|
comm -13 bitmaps commits >after &&
|
|
|
|
! test_cmp before after
|
|
)
|
|
'
|
|
|
|
# The first argument is expected to be a filename
|
|
# and that file should contain the name of a .idx
|
|
# file. Send the list of objects in that .idx file
|
|
# into stdout.
|
|
get_sorted_objects_from_pack () {
|
|
git show-index <$(cat "$1") >raw &&
|
|
cut -d" " -f2 raw
|
|
}
|
|
|
|
test_expect_success '--write-midx -b packs non-kept objects' '
|
|
git init repo &&
|
|
test_when_finished "rm -fr repo" &&
|
|
(
|
|
cd repo &&
|
|
|
|
# Create a kept pack-file
|
|
test_commit base &&
|
|
git repack -ad &&
|
|
find $objdir/pack -name "*.idx" >before &&
|
|
test_line_count = 1 before &&
|
|
before_name=$(cat before) &&
|
|
>${before_name%.idx}.keep &&
|
|
|
|
# Create a non-kept pack-file
|
|
test_commit other &&
|
|
git repack &&
|
|
|
|
# Create loose objects
|
|
test_commit loose &&
|
|
|
|
# Repack everything
|
|
git repack --write-midx -a -b -d &&
|
|
|
|
# There should be two pack-files now, the
|
|
# old, kept pack and the new, non-kept pack.
|
|
find $objdir/pack -name "*.idx" | sort >after &&
|
|
test_line_count = 2 after &&
|
|
find $objdir/pack -name "*.keep" >kept &&
|
|
kept_name=$(cat kept) &&
|
|
echo ${kept_name%.keep}.idx >kept-idx &&
|
|
test_cmp before kept-idx &&
|
|
|
|
# Get object list from the kept pack.
|
|
get_sorted_objects_from_pack before >old.objects &&
|
|
|
|
# Get object list from the one non-kept pack-file
|
|
comm -13 before after >new-pack &&
|
|
test_line_count = 1 new-pack &&
|
|
get_sorted_objects_from_pack new-pack >new.objects &&
|
|
|
|
# None of the objects in the new pack should
|
|
# exist within the kept pack.
|
|
comm -12 old.objects new.objects >shared.objects &&
|
|
test_must_be_empty shared.objects
|
|
)
|
|
'
|
|
|
|
test_expect_success '--write-midx removes stale pack-based bitmaps' '
|
|
rm -fr repo &&
|
|
git init repo &&
|
|
test_when_finished "rm -fr repo" &&
|
|
(
|
|
cd repo &&
|
|
test_commit base &&
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack -Ab &&
|
|
|
|
pack_bitmap=$(ls $objdir/pack/pack-*.bitmap) &&
|
|
test_path_is_file "$pack_bitmap" &&
|
|
|
|
test_commit tip &&
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack -bm &&
|
|
|
|
test_path_is_file $midx &&
|
|
test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
|
|
test_path_is_missing $pack_bitmap
|
|
)
|
|
'
|
|
|
|
test_expect_success '--write-midx with --pack-kept-objects' '
|
|
git init repo &&
|
|
test_when_finished "rm -fr repo" &&
|
|
(
|
|
cd repo &&
|
|
|
|
test_commit one &&
|
|
test_commit two &&
|
|
|
|
one="$(echo "one" | git pack-objects --revs $objdir/pack/pack)" &&
|
|
two="$(echo "one..two" | git pack-objects --revs $objdir/pack/pack)" &&
|
|
|
|
keep="$objdir/pack/pack-$one.keep" &&
|
|
touch "$keep" &&
|
|
|
|
git repack --write-midx --write-bitmap-index --geometric=2 -d \
|
|
--pack-kept-objects &&
|
|
|
|
test_path_is_file $keep &&
|
|
test_path_is_file $midx &&
|
|
test_path_is_file $midx-$(midx_checksum $objdir).bitmap
|
|
)
|
|
'
|
|
|
|
test_expect_success TTY '--quiet disables progress' '
|
|
test_terminal env GIT_PROGRESS_DELAY=0 \
|
|
git -C midx repack -ad --quiet --write-midx 2>stderr &&
|
|
test_must_be_empty stderr
|
|
'
|
|
|
|
test_expect_success 'clean up .tmp-* packs on error' '
|
|
test_must_fail ok=sigpipe git \
|
|
-c repack.cruftwindow=bogus \
|
|
repack -ad --cruft &&
|
|
find $objdir/pack -name '.tmp-*' >tmpfiles &&
|
|
test_must_be_empty tmpfiles
|
|
'
|
|
|
|
test_expect_success 'repack -ad cleans up old .tmp-* packs' '
|
|
git rev-parse HEAD >input &&
|
|
git pack-objects $objdir/pack/.tmp-1234 <input &&
|
|
git repack -ad &&
|
|
find $objdir/pack -name '.tmp-*' >tmpfiles &&
|
|
test_must_be_empty tmpfiles
|
|
'
|
|
|
|
test_expect_success 'setup for update-server-info' '
|
|
git init update-server-info &&
|
|
test_commit -C update-server-info message
|
|
'
|
|
|
|
test_server_info_present () {
|
|
test_path_is_file update-server-info/.git/objects/info/packs &&
|
|
test_path_is_file update-server-info/.git/info/refs
|
|
}
|
|
|
|
test_server_info_missing () {
|
|
test_path_is_missing update-server-info/.git/objects/info/packs &&
|
|
test_path_is_missing update-server-info/.git/info/refs
|
|
}
|
|
|
|
test_server_info_cleanup () {
|
|
rm -f update-server-info/.git/objects/info/packs update-server-info/.git/info/refs &&
|
|
test_server_info_missing
|
|
}
|
|
|
|
test_expect_success 'updates server info by default' '
|
|
test_server_info_cleanup &&
|
|
git -C update-server-info repack &&
|
|
test_server_info_present
|
|
'
|
|
|
|
test_expect_success '-n skips updating server info' '
|
|
test_server_info_cleanup &&
|
|
git -C update-server-info repack -n &&
|
|
test_server_info_missing
|
|
'
|
|
|
|
test_expect_success 'repack.updateServerInfo=true updates server info' '
|
|
test_server_info_cleanup &&
|
|
git -C update-server-info -c repack.updateServerInfo=true repack &&
|
|
test_server_info_present
|
|
'
|
|
|
|
test_expect_success 'repack.updateServerInfo=false skips updating server info' '
|
|
test_server_info_cleanup &&
|
|
git -C update-server-info -c repack.updateServerInfo=false repack &&
|
|
test_server_info_missing
|
|
'
|
|
|
|
test_expect_success '-n overrides repack.updateServerInfo=true' '
|
|
test_server_info_cleanup &&
|
|
git -C update-server-info -c repack.updateServerInfo=true repack -n &&
|
|
test_server_info_missing
|
|
'
|
|
|
|
test_done
|