mirror of
https://github.com/git/git.git
synced 2024-10-20 09:59:05 +02:00
de3a864114
The pack.useSparse config option was introduced by 3d036eb0 (pack-objects: create pack.useSparse setting, 2019-01-19) and was first available in v2.21.0. When enabled, the pack-objects process during 'git push' will use a sparse tree walk when deciding which trees and blobs to send to the remote. The algorithm was introduced by d5d2e93 (revision: implement sparse algorithm, 2019-01-16) and has been in production use by VFS for Git since around that time. The features.experimental config option also enabled pack.useSparse, so hopefully that has also increased exposure. It is worth noting that pack.useSparse has a possibility of sending more objects across a push, but requires a special arrangement of exact _copies_ across directories. There is a test in t5322-pack-objects-sparse.sh that demonstrates this possibility. This test uses the --sparse option to "git pack-objects" but we can make it implied by the config value to demonstrate that the default value has changed. While updating that test, I noticed that the documentation did not include an option for --no-sparse, which is now more important than it was before. Since the downside is unlikely but the upside is significant, set the default value of pack.useSparse to true. Remove it from the set of options implied by features.experimental. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
138 lines
4.3 KiB
Bash
Executable File
138 lines
4.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='pack-objects object selection using sparse algorithm'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup repo' '
|
|
test_commit initial &&
|
|
for i in $(test_seq 1 3)
|
|
do
|
|
mkdir f$i &&
|
|
for j in $(test_seq 1 3)
|
|
do
|
|
mkdir f$i/f$j &&
|
|
echo $j >f$i/f$j/data.txt
|
|
done
|
|
done &&
|
|
git add . &&
|
|
git commit -m "Initialized trees" &&
|
|
for i in $(test_seq 1 3)
|
|
do
|
|
git checkout -b topic$i master &&
|
|
echo change-$i >f$i/f$i/data.txt &&
|
|
git commit -a -m "Changed f$i/f$i/data.txt"
|
|
done &&
|
|
cat >packinput.txt <<-EOF &&
|
|
topic1
|
|
^topic2
|
|
^topic3
|
|
EOF
|
|
git rev-parse \
|
|
topic1 \
|
|
topic1^{tree} \
|
|
topic1:f1 \
|
|
topic1:f1/f1 \
|
|
topic1:f1/f1/data.txt | sort >expect_objects.txt
|
|
'
|
|
|
|
test_expect_success 'non-sparse pack-objects' '
|
|
git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
|
|
git index-pack -o nonsparse.idx nonsparse.pack &&
|
|
git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
|
|
test_cmp expect_objects.txt nonsparse_objects.txt
|
|
'
|
|
|
|
test_expect_success 'sparse pack-objects' '
|
|
git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
|
|
git index-pack -o sparse.idx sparse.pack &&
|
|
git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
|
|
test_cmp expect_objects.txt sparse_objects.txt
|
|
'
|
|
|
|
test_expect_success 'duplicate a folder from f3 and commit to topic1' '
|
|
git checkout topic1 &&
|
|
echo change-3 >f3/f3/data.txt &&
|
|
git commit -a -m "Changed f3/f3/data.txt" &&
|
|
git rev-parse \
|
|
topic1~1 \
|
|
topic1~1^{tree} \
|
|
topic1^{tree} \
|
|
topic1 \
|
|
topic1:f1 \
|
|
topic1:f1/f1 \
|
|
topic1:f1/f1/data.txt | sort >required_objects.txt
|
|
'
|
|
|
|
test_expect_success 'non-sparse pack-objects' '
|
|
git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
|
|
git index-pack -o nonsparse.idx nonsparse.pack &&
|
|
git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
|
|
comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
|
|
test_cmp required_objects.txt nonsparse_required_objects.txt
|
|
'
|
|
|
|
test_expect_success 'sparse pack-objects' '
|
|
git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
|
|
git index-pack -o sparse.idx sparse.pack &&
|
|
git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
|
|
comm -1 -2 required_objects.txt sparse_objects.txt >sparse_required_objects.txt &&
|
|
test_cmp required_objects.txt sparse_required_objects.txt
|
|
'
|
|
|
|
# Demonstrate that the algorithms differ when we copy a tree wholesale
|
|
# from one folder to another.
|
|
|
|
test_expect_success 'duplicate a folder from f1 into f3' '
|
|
mkdir f3/f4 &&
|
|
cp -r f1/f1/* f3/f4 &&
|
|
git add f3/f4 &&
|
|
git commit -m "Copied f1/f1 to f3/f4" &&
|
|
cat >packinput.txt <<-EOF &&
|
|
topic1
|
|
^topic1~1
|
|
EOF
|
|
git rev-parse \
|
|
topic1 \
|
|
topic1^{tree} \
|
|
topic1:f3 | sort >required_objects.txt
|
|
'
|
|
|
|
test_expect_success 'non-sparse pack-objects' '
|
|
git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
|
|
git index-pack -o nonsparse.idx nonsparse.pack &&
|
|
git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
|
|
comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
|
|
test_cmp required_objects.txt nonsparse_required_objects.txt
|
|
'
|
|
|
|
# --sparse is enabled by default by pack.useSparse
|
|
test_expect_success 'sparse pack-objects' '
|
|
git rev-parse \
|
|
topic1 \
|
|
topic1^{tree} \
|
|
topic1:f3 \
|
|
topic1:f3/f4 \
|
|
topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt &&
|
|
git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
|
|
git index-pack -o sparse.idx sparse.pack &&
|
|
git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
|
|
test_cmp expect_sparse_objects.txt sparse_objects.txt
|
|
'
|
|
|
|
test_expect_success 'pack.useSparse enables algorithm' '
|
|
git config pack.useSparse true &&
|
|
git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
|
|
git index-pack -o sparse.idx sparse.pack &&
|
|
git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
|
|
test_cmp expect_sparse_objects.txt sparse_objects.txt
|
|
'
|
|
|
|
test_expect_success 'pack.useSparse overridden' '
|
|
git pack-objects --stdout --revs --no-sparse <packinput.txt >sparse.pack &&
|
|
git index-pack -o sparse.idx sparse.pack &&
|
|
git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
|
|
test_cmp required_objects.txt sparse_objects.txt
|
|
'
|
|
|
|
test_done
|