mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
1190a1acf8
Our current scheme for naming packfiles is to calculate the sha1 hash of the sorted list of objects contained in the packfile. This gives us a unique name, so we are reasonably sure that two packs with the same name will contain the same objects. It does not, however, tell us that two such packs have the exact same bytes. This makes things awkward if we repack the same set of objects. Due to run-to-run variations, the bytes may not be identical (e.g., changed zlib or git versions, different source object reuse due to new packs in the repository, or even different deltas due to races during a multi-threaded delta search). In theory, this could be helpful to a program that cares that the packfile contains a certain set of objects, but does not care about the particular representation. In practice, no part of git makes use of that, and in many cases it is potentially harmful. For example, if a dumb http client fetches the .idx file, it must be sure to get the exact .pack that matches it. Similarly, a partial transfer of a .pack file cannot be safely resumed, as the actual bytes may have changed. This could also affect a local client which opened the .idx and .pack files, closes the .pack file (due to memory or file descriptor limits), and then re-opens a changed packfile. In all of these cases, git can detect the problem, as we have the sha1 of the bytes themselves in the pack trailer (which we verify on transfer), and the .idx file references the trailer from the matching packfile. But it would be simpler and more efficient to actually get the correct bytes, rather than noticing the problem and having to restart the operation. This patch simply uses the pack trailer sha1 as the pack name. It should be similarly unique, but covers the exact representation of the objects. Other parts of git should not care, as the pack name is returned by pack-objects and is essentially opaque. One test needs to be updated, because it actually corrupts a pack and expects that re-packing the corrupted bytes will use the same name. It won't anymore, but we can easily just use the name that pack-objects hands back. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
246 lines
8.7 KiB
Bash
Executable file
246 lines
8.7 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Nicolas Pitre
|
|
#
|
|
|
|
test_description='pack index with 64-bit offsets and object CRC'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success \
|
|
'setup' \
|
|
'rm -rf .git &&
|
|
git init &&
|
|
git config pack.threads 1 &&
|
|
i=1 &&
|
|
while test $i -le 100
|
|
do
|
|
iii=`printf '%03i' $i`
|
|
test-genrandom "bar" 200 > wide_delta_$iii &&
|
|
test-genrandom "baz $iii" 50 >> wide_delta_$iii &&
|
|
test-genrandom "foo"$i 100 > deep_delta_$iii &&
|
|
test-genrandom "foo"`expr $i + 1` 100 >> deep_delta_$iii &&
|
|
test-genrandom "foo"`expr $i + 2` 100 >> deep_delta_$iii &&
|
|
echo $iii >file_$iii &&
|
|
test-genrandom "$iii" 8192 >>file_$iii &&
|
|
git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
|
|
i=`expr $i + 1` || return 1
|
|
done &&
|
|
{ echo 101 && test-genrandom 100 8192; } >file_101 &&
|
|
git update-index --add file_101 &&
|
|
tree=`git write-tree` &&
|
|
commit=`git commit-tree $tree </dev/null` && {
|
|
echo $tree &&
|
|
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
|
|
} >obj-list &&
|
|
git update-ref HEAD $commit'
|
|
|
|
test_expect_success \
|
|
'pack-objects with index version 1' \
|
|
'pack1=$(git pack-objects --index-version=1 test-1 <obj-list) &&
|
|
git verify-pack -v "test-1-${pack1}.pack"'
|
|
|
|
test_expect_success \
|
|
'pack-objects with index version 2' \
|
|
'pack2=$(git pack-objects --index-version=2 test-2 <obj-list) &&
|
|
git verify-pack -v "test-2-${pack2}.pack"'
|
|
|
|
test_expect_success \
|
|
'both packs should be identical' \
|
|
'cmp "test-1-${pack1}.pack" "test-2-${pack2}.pack"'
|
|
|
|
test_expect_success \
|
|
'index v1 and index v2 should be different' \
|
|
'! cmp "test-1-${pack1}.idx" "test-2-${pack2}.idx"'
|
|
|
|
test_expect_success \
|
|
'index-pack with index version 1' \
|
|
'git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"'
|
|
|
|
test_expect_success \
|
|
'index-pack with index version 2' \
|
|
'git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"'
|
|
|
|
test_expect_success \
|
|
'index-pack results should match pack-objects ones' \
|
|
'cmp "test-1-${pack1}.idx" "1.idx" &&
|
|
cmp "test-2-${pack2}.idx" "2.idx"'
|
|
|
|
test_expect_success 'index-pack --verify on index version 1' '
|
|
git index-pack --verify "test-1-${pack1}.pack"
|
|
'
|
|
|
|
test_expect_success 'index-pack --verify on index version 2' '
|
|
git index-pack --verify "test-2-${pack2}.pack"
|
|
'
|
|
|
|
test_expect_success \
|
|
'pack-objects --index-version=2, is not accepted' \
|
|
'test_must_fail git pack-objects --index-version=2, test-3 <obj-list'
|
|
|
|
test_expect_success \
|
|
'index v2: force some 64-bit offsets with pack-objects' \
|
|
'pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)'
|
|
|
|
if msg=$(git verify-pack -v "test-3-${pack3}.pack" 2>&1) ||
|
|
! (echo "$msg" | grep "pack too large .* off_t")
|
|
then
|
|
test_set_prereq OFF64_T
|
|
else
|
|
say "# skipping tests concerning 64-bit offsets"
|
|
fi
|
|
|
|
test_expect_success OFF64_T \
|
|
'index v2: verify a pack with some 64-bit offsets' \
|
|
'git verify-pack -v "test-3-${pack3}.pack"'
|
|
|
|
test_expect_success OFF64_T \
|
|
'64-bit offsets: should be different from previous index v2 results' \
|
|
'! cmp "test-2-${pack2}.idx" "test-3-${pack3}.idx"'
|
|
|
|
test_expect_success OFF64_T \
|
|
'index v2: force some 64-bit offsets with index-pack' \
|
|
'git index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"'
|
|
|
|
test_expect_success OFF64_T \
|
|
'64-bit offsets: index-pack result should match pack-objects one' \
|
|
'cmp "test-3-${pack3}.idx" "3.idx"'
|
|
|
|
test_expect_success OFF64_T 'index-pack --verify on 64-bit offset v2 (cheat)' '
|
|
# This cheats by knowing which lower offset should still be encoded
|
|
# in 64-bit representation.
|
|
git index-pack --verify --index-version=2,0x40000 "test-3-${pack3}.pack"
|
|
'
|
|
|
|
test_expect_success OFF64_T 'index-pack --verify on 64-bit offset v2' '
|
|
git index-pack --verify "test-3-${pack3}.pack"
|
|
'
|
|
|
|
# returns the object number for given object in given pack index
|
|
index_obj_nr()
|
|
{
|
|
idx_file=$1
|
|
object_sha1=$2
|
|
nr=0
|
|
git show-index < $idx_file |
|
|
while read offs sha1 extra
|
|
do
|
|
nr=$(($nr + 1))
|
|
test "$sha1" = "$object_sha1" || continue
|
|
echo "$(($nr - 1))"
|
|
break
|
|
done
|
|
}
|
|
|
|
# returns the pack offset for given object as found in given pack index
|
|
index_obj_offset()
|
|
{
|
|
idx_file=$1
|
|
object_sha1=$2
|
|
git show-index < $idx_file | grep $object_sha1 |
|
|
( read offs extra && echo "$offs" )
|
|
}
|
|
|
|
test_expect_success \
|
|
'[index v1] 1) stream pack to repository' \
|
|
'git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&
|
|
git prune-packed &&
|
|
git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
|
|
cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
|
|
cmp "test-1-${pack1}.idx" ".git/objects/pack/pack-${pack1}.idx"'
|
|
|
|
test_expect_success \
|
|
'[index v1] 2) create a stealth corruption in a delta base reference' \
|
|
'# This test assumes file_101 is a delta smaller than 16 bytes.
|
|
# It should be against file_100 but we substitute its base for file_099
|
|
sha1_101=`git hash-object file_101` &&
|
|
sha1_099=`git hash-object file_099` &&
|
|
offs_101=`index_obj_offset 1.idx $sha1_101` &&
|
|
nr_099=`index_obj_nr 1.idx $sha1_099` &&
|
|
chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
|
|
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
|
|
if=".git/objects/pack/pack-${pack1}.idx" \
|
|
skip=$((4 + 256 * 4 + $nr_099 * 24)) \
|
|
bs=1 count=20 conv=notrunc &&
|
|
git cat-file blob $sha1_101 > file_101_foo1'
|
|
|
|
test_expect_success \
|
|
'[index v1] 3) corrupted delta happily returned wrong data' \
|
|
'test -f file_101_foo1 && ! cmp file_101 file_101_foo1'
|
|
|
|
test_expect_success \
|
|
'[index v1] 4) confirm that the pack is actually corrupted' \
|
|
'test_must_fail git fsck --full $commit'
|
|
|
|
test_expect_success \
|
|
'[index v1] 5) pack-objects happily reuses corrupted data' \
|
|
'pack4=$(git pack-objects test-4 <obj-list) &&
|
|
test -f "test-4-${pack4}.pack"'
|
|
|
|
test_expect_success \
|
|
'[index v1] 6) newly created pack is BAD !' \
|
|
'test_must_fail git verify-pack -v "test-4-${pack4}.pack"'
|
|
|
|
test_expect_success \
|
|
'[index v2] 1) stream pack to repository' \
|
|
'rm -f .git/objects/pack/* &&
|
|
git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
|
|
git prune-packed &&
|
|
git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
|
|
cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
|
|
cmp "test-2-${pack1}.idx" ".git/objects/pack/pack-${pack1}.idx"'
|
|
|
|
test_expect_success \
|
|
'[index v2] 2) create a stealth corruption in a delta base reference' \
|
|
'# This test assumes file_101 is a delta smaller than 16 bytes.
|
|
# It should be against file_100 but we substitute its base for file_099
|
|
sha1_101=`git hash-object file_101` &&
|
|
sha1_099=`git hash-object file_099` &&
|
|
offs_101=`index_obj_offset 1.idx $sha1_101` &&
|
|
nr_099=`index_obj_nr 1.idx $sha1_099` &&
|
|
chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
|
|
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
|
|
if=".git/objects/pack/pack-${pack1}.idx" \
|
|
skip=$((8 + 256 * 4 + $nr_099 * 20)) \
|
|
bs=1 count=20 conv=notrunc &&
|
|
git cat-file blob $sha1_101 > file_101_foo2'
|
|
|
|
test_expect_success \
|
|
'[index v2] 3) corrupted delta happily returned wrong data' \
|
|
'test -f file_101_foo2 && ! cmp file_101 file_101_foo2'
|
|
|
|
test_expect_success \
|
|
'[index v2] 4) confirm that the pack is actually corrupted' \
|
|
'test_must_fail git fsck --full $commit'
|
|
|
|
test_expect_success \
|
|
'[index v2] 5) pack-objects refuses to reuse corrupted data' \
|
|
'test_must_fail git pack-objects test-5 <obj-list &&
|
|
test_must_fail git pack-objects --no-reuse-object test-6 <obj-list'
|
|
|
|
test_expect_success \
|
|
'[index v2] 6) verify-pack detects CRC mismatch' \
|
|
'rm -f .git/objects/pack/* &&
|
|
git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
|
|
git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
|
|
obj=`git hash-object file_001` &&
|
|
nr=`index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj` &&
|
|
chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
|
|
printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
|
|
bs=1 count=4 seek=$((8 + 256 * 4 + `wc -l <obj-list` * 20 + $nr * 4)) &&
|
|
( while read obj
|
|
do git cat-file -p $obj >/dev/null || exit 1
|
|
done <obj-list ) &&
|
|
test_must_fail git verify-pack ".git/objects/pack/pack-${pack1}.pack"
|
|
'
|
|
|
|
test_expect_success 'running index-pack in the object store' '
|
|
rm -f .git/objects/pack/* &&
|
|
cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack &&
|
|
(
|
|
cd .git/objects/pack
|
|
git index-pack pack-${pack1}.pack
|
|
) &&
|
|
test -f .git/objects/pack/pack-${pack1}.idx
|
|
'
|
|
|
|
test_done
|