undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/pack-objects-negative-options-fix'

Browse Source 
Options to "git pack-objects" that take numeric values like
--window and --depth should not accept negative values; the input
validation has been tightened.

* jk/pack-objects-negative-options-fix:
  pack-objects: clamp negative depth to 0
  t5316: check behavior of pack-objects --depth=0
  pack-objects: clamp negative window size to 0
  t5300: check that we produced expected number of deltas
  t5300: modernize basic tests
This commit is contained in:
Junio C Hamano 2021-05-11 15:27:23 +09:00
commit 1af57f5d32
3 changed files with 124 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/pack-objects.c
View File

@ -3867,6 +3867,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
if (pack_to_stdout != !base_name || argc) if (pack_to_stdout != !base_name || argc)
usage_with_options(pack_usage, pack_objects_options); usage_with_options(pack_usage, pack_objects_options);
if (depth < 0)
depth = 0;
if (depth >= (1 << OE_DEPTH_BITS)) { if (depth >= (1 << OE_DEPTH_BITS)) {
warning(_("delta chain depth %d is too deep, forcing %d"), warning(_("delta chain depth %d is too deep, forcing %d"),
depth, (1 << OE_DEPTH_BITS) - 1); depth, (1 << OE_DEPTH_BITS) - 1);
@ -3877,6 +3879,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
(1U << OE_Z_DELTA_BITS) - 1); (1U << OE_Z_DELTA_BITS) - 1);
cache_max_small_delta_size = (1U << OE_Z_DELTA_BITS) - 1; cache_max_small_delta_size = (1U << OE_Z_DELTA_BITS) - 1;
} }
if (window < 0)
window = 0;
strvec_push(&rp, "pack-objects"); strvec_push(&rp, "pack-objects");
if (thin) { if (thin) {

209
t/t5300-pack-object.sh
View File

@ -8,11 +8,8 @@ test_description='git pack-object
' '
. ./test-lib.sh . ./test-lib.sh
TRASH=$(pwd) test_expect_success 'setup' '
rm -f .git/index* &&
test_expect_success \
'setup' \
'rm -f .git/index* &&
perl -e "print \"a\" x 4096;" >a && perl -e "print \"a\" x 4096;" >a &&
perl -e "print \"b\" x 4096;" >b && perl -e "print \"b\" x 4096;" >b &&
perl -e "print \"c\" x 4096;" >c && perl -e "print \"c\" x 4096;" >c &&
@ -21,112 +18,81 @@ test_expect_success \
git update-index --add a a_big b b_big c && git update-index --add a a_big b b_big c &&
cat c >d && echo foo >>d && git update-index --add d && cat c >d && echo foo >>d && git update-index --add d &&
tree=$(git write-tree) && tree=$(git write-tree) &&
commit=$(git commit-tree $tree </dev/null) && { commit=$(git commit-tree $tree </dev/null) &&
{
echo $tree && echo $tree &&
echo $commit && echo $commit &&
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/" git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
} >obj-list && { } >obj-list &&
{
git diff-tree --root -p $commit && git diff-tree --root -p $commit &&
while read object while read object
do do
t=$(git cat-file -t $object) && t=$(git cat-file -t $object) &&
git cat-file $t $object || return 1 git cat-file $t $object || return 1
done <obj-list done <obj-list
} >expect' } >expect
'
test_expect_success \ # usage: check_deltas <stderr_from_pack_objects> <cmp_op> <nr_deltas>
'pack without delta' \ # e.g.: check_deltas stderr -gt 0
'packname_1=$(git pack-objects --window=0 test-1 <obj-list)' check_deltas() {
deltas=$(perl -lne '/delta (\d+)/ and print $1' "$1") &&
shift &&
if ! test "$deltas" "$@"
then
echo >&2 "unexpected number of deltas (compared $delta $*)"
return 1
fi
}
test_expect_success \ test_expect_success 'pack without delta' '
'pack-objects with bogus arguments' \ packname_1=$(git pack-objects --progress --window=0 test-1 \
'test_must_fail git pack-objects --window=0 test-1 blah blah <obj-list' <obj-list 2>stderr) &&
check_deltas stderr = 0
'
rm -fr .git2 test_expect_success 'pack-objects with bogus arguments' '
mkdir .git2 test_must_fail git pack-objects --window=0 test-1 blah blah <obj-list
'
test_expect_success \ check_unpack () {
'unpack without delta' \ test_when_finished "rm -rf git2" &&
"GIT_OBJECT_DIRECTORY=.git2/objects && git init --bare git2 &&
export GIT_OBJECT_DIRECTORY && git -C git2 unpack-objects -n <"$1".pack &&
git init && git -C git2 unpack-objects <"$1".pack &&
git unpack-objects -n <test-1-${packname_1}.pack && (cd .git && find objects -type f -print) |
git unpack-objects <test-1-${packname_1}.pack"
unset GIT_OBJECT_DIRECTORY
cd "$TRASH/.git2"
test_expect_success \
'check unpack without delta' \
'(cd ../.git && find objects -type f -print) |
while read path while read path
do do
cmp $path ../.git/$path || { cmp git2/$path .git/$path || {
echo $path differs. echo $path differs.
return 1 return 1
} }
done' done
cd "$TRASH"
test_expect_success \
'pack with REF_DELTA' \
'pwd &&
packname_2=$(git pack-objects test-2 <obj-list)'
rm -fr .git2
mkdir .git2
test_expect_success \
'unpack with REF_DELTA' \
'GIT_OBJECT_DIRECTORY=.git2/objects &&
export GIT_OBJECT_DIRECTORY &&
git init &&
git unpack-objects -n <test-2-${packname_2}.pack &&
git unpack-objects <test-2-${packname_2}.pack'
unset GIT_OBJECT_DIRECTORY
cd "$TRASH/.git2"
test_expect_success \
'check unpack with REF_DELTA' \
'(cd ../.git && find objects -type f -print) |
while read path
do
cmp $path ../.git/$path || {
echo $path differs.
return 1
} }
done'
cd "$TRASH"
test_expect_success \ test_expect_success 'unpack without delta' '
'pack with OFS_DELTA' \ check_unpack test-1-${packname_1}
'pwd && '
packname_3=$(git pack-objects --delta-base-offset test-3 <obj-list)'
rm -fr .git2 test_expect_success 'pack with REF_DELTA' '
mkdir .git2 packname_2=$(git pack-objects --progress test-2 <obj-list 2>stderr) &&
check_deltas stderr -gt 0
'
test_expect_success \ test_expect_success 'unpack with REF_DELTA' '
'unpack with OFS_DELTA' \ check_unpack test-2-${packname_2}
'GIT_OBJECT_DIRECTORY=.git2/objects && '
export GIT_OBJECT_DIRECTORY &&
git init &&
git unpack-objects -n <test-3-${packname_3}.pack &&
git unpack-objects <test-3-${packname_3}.pack'
unset GIT_OBJECT_DIRECTORY test_expect_success 'pack with OFS_DELTA' '
cd "$TRASH/.git2" packname_3=$(git pack-objects --progress --delta-base-offset test-3 \
test_expect_success \ <obj-list 2>stderr) &&
'check unpack with OFS_DELTA' \ check_deltas stderr -gt 0
'(cd ../.git && find objects -type f -print) | '
while read path
do test_expect_success 'unpack with OFS_DELTA' '
cmp $path ../.git/$path || { check_unpack test-3-${packname_3}
echo $path differs. '
return 1
}
done'
cd "$TRASH"
test_expect_success 'compare delta flavors' ' test_expect_success 'compare delta flavors' '
perl -e '\'' perl -e '\''
@ -135,55 +101,33 @@ test_expect_success 'compare delta flavors' '
'\'' test-2-$packname_2.pack test-3-$packname_3.pack '\'' test-2-$packname_2.pack test-3-$packname_3.pack
' '
rm -fr .git2 check_use_objects () {
mkdir .git2 test_when_finished "rm -rf git2" &&
git init --bare git2 &&
test_expect_success \ cp "$1".pack "$1".idx git2/objects/pack &&
'use packed objects' \ (
'GIT_OBJECT_DIRECTORY=.git2/objects && cd git2 &&
export GIT_OBJECT_DIRECTORY &&
git init &&
cp test-1-${packname_1}.pack test-1-${packname_1}.idx .git2/objects/pack && {
git diff-tree --root -p $commit && git diff-tree --root -p $commit &&
while read object while read object
do do
t=$(git cat-file -t $object) && t=$(git cat-file -t $object) &&
git cat-file $t $object || return 1 git cat-file $t $object || exit 1
done <obj-list done
} >current && ) <obj-list >current &&
cmp expect current' cmp expect current
}
test_expect_success \ test_expect_success 'use packed objects' '
'use packed deltified (REF_DELTA) objects' \ check_use_objects test-1-${packname_1}
'GIT_OBJECT_DIRECTORY=.git2/objects && '
export GIT_OBJECT_DIRECTORY &&
rm -f .git2/objects/pack/test-* &&
cp test-2-${packname_2}.pack test-2-${packname_2}.idx .git2/objects/pack && {
git diff-tree --root -p $commit &&
while read object
do
t=$(git cat-file -t $object) &&
git cat-file $t $object || return 1
done <obj-list
} >current &&
cmp expect current'
test_expect_success \ test_expect_success 'use packed deltified (REF_DELTA) objects' '
'use packed deltified (OFS_DELTA) objects' \ check_use_objects test-2-${packname_2}
'GIT_OBJECT_DIRECTORY=.git2/objects && '
export GIT_OBJECT_DIRECTORY &&
rm -f .git2/objects/pack/test-* &&
cp test-3-${packname_3}.pack test-3-${packname_3}.idx .git2/objects/pack && {
git diff-tree --root -p $commit &&
while read object
do
t=$(git cat-file -t $object) &&
git cat-file $t $object || return 1
done <obj-list
} >current &&
cmp expect current'
unset GIT_OBJECT_DIRECTORY test_expect_success 'use packed deltified (OFS_DELTA) objects' '
check_use_objects test-3-${packname_3}
'
test_expect_success 'survive missing objects/pack directory' ' test_expect_success 'survive missing objects/pack directory' '
( (
@ -669,4 +613,9 @@ test_expect_success '--stdin-packs with broken links' '
) )
' '
test_expect_success 'negative window clamps to 0' '
git pack-objects --progress --window=-1 neg-window <obj-list 2>stderr &&
check_deltas stderr = 0
'
test_done test_done

15
t/t5316-pack-delta-depth.sh
View File

@ -69,6 +69,7 @@ test_expect_success 'create series of packs' '
max_chain() { max_chain() {
git index-pack --verify-stat-only "$1" >output && git index-pack --verify-stat-only "$1" >output &&
perl -lne ' perl -lne '
BEGIN { $len = 0 }
/chain length = (\d+)/ and $len = $1; /chain length = (\d+)/ and $len = $1;
END { print $len } END { print $len }
' output ' output
@ -94,4 +95,18 @@ test_expect_success '--depth limits depth' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success '--depth=0 disables deltas' '
pack=$(git pack-objects --all --depth=0 </dev/null pack) &&
echo 0 >expect &&
max_chain pack-$pack.pack >actual &&
test_cmp expect actual
'
test_expect_success 'negative depth disables deltas' '
pack=$(git pack-objects --all --depth=-1 </dev/null pack) &&
echo 0 >expect &&
max_chain pack-$pack.pack >actual &&
test_cmp expect actual
'
test_done test_done