summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-27 10:35:33 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 22:27:51 (GMT)
commit1f688557c0b4963d5e0b93ad5cddad31e5322709 (patch)
tree1012f836f129ee7cf52cc18a0e573449aa6e3170 /t
parent36e4d74a210ba618e1520f11ce7fc2f8baec5bb8 (diff)
downloadgit-1f688557c0b4963d5e0b93ad5cddad31e5322709.zip
git-1f688557c0b4963d5e0b93ad5cddad31e5322709.tar.gz
git-1f688557c0b4963d5e0b93ad5cddad31e5322709.tar.bz2
[PATCH] Teach read_sha1_file() and friends about packed git object store.
GIT_OBJECT_DIRECTORY and GIT_ALTERNATE_OBJECT_DIRECTORIES can have the "pack" subdirectory that houses "packed GIT" files produced by git-pack-objects (e.g. .git/objects/pack/foo.pack and .git/objects/pack/foo.idx; always store them as pairs). The following functions in sha1_file.c can then read object contents from such packed file: - sha1_object_info() - has_sha1_file() - read_sha1_file() Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't')
-rwxr-xr-xt/t5300-pack-object.sh48
1 files changed, 46 insertions, 2 deletions
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 171af64..9016536 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -19,10 +19,19 @@ test_expect_success \
git-update-cache --add $i || exit
done &&
cat c >d && echo foo >>d && git-update-cache --add d &&
- tree=`git-write-tree` && {
+ tree=`git-write-tree` &&
+ commit=`git-commit-tree $tree </dev/null` && {
echo $tree &&
+ echo $commit &&
git-ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
- } >obj-list'
+ } >obj-list && {
+ git-diff-tree --root -p $commit &&
+ while read object
+ do
+ t=`git-cat-file -t $object` &&
+ git-cat-file $t $object || exit 1
+ done <obj-list
+ } >expect'
test_expect_success \
'pack without delta' \
@@ -82,4 +91,39 @@ test_expect_success \
done'
cd $TRASH
+rm -fr .git2
+mkdir .git2
+
+test_expect_success \
+ 'use packed objects' \
+ 'GIT_OBJECT_DIRECTORY=.git2/objects &&
+ export GIT_OBJECT_DIRECTORY &&
+ git-init-db &&
+ mkdir .git2/objects/pack &&
+ cp test-1.pack test-1.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 || exit 1
+ done <obj-list
+ } >current &&
+ diff expect current'
+
+
+test_expect_success \
+ 'use packed deltified objects' \
+ 'GIT_OBJECT_DIRECTORY=.git2/objects &&
+ export GIT_OBJECT_DIRECTORY &&
+ rm -f .git2/objects/pack/test-?.idx &&
+ cp test-2.pack test-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 || exit 1
+ done <obj-list
+ } >current &&
+ diff expect current'
+
test_done