projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] New git-apply test cases for scanning forwards and backwards.
[git.git]
/
t
/
t5300-pack-object.sh
diff --git
a/t/t5300-pack-object.sh
b/t/t5300-pack-object.sh
index
d993120
..
0395124
100755
(executable)
--- a/
t/t5300-pack-object.sh
+++ b/
t/t5300-pack-object.sh
@@
-16,7
+16,7
@@
test_expect_success \
for i in a b c
do
dd if=/dev/zero bs=4k count=1 | tr "\\0" $i >$i &&
for i in a b c
do
dd if=/dev/zero bs=4k count=1 | tr "\\0" $i >$i &&
- git-update-cache --add $i ||
exit
+ git-update-cache --add $i ||
return 1
done &&
cat c >d && echo foo >>d && git-update-cache --add d &&
tree=`git-write-tree` &&
done &&
cat c >d && echo foo >>d && git-update-cache --add d &&
tree=`git-write-tree` &&
@@
-29,23
+29,24
@@
test_expect_success \
while read object
do
t=`git-cat-file -t $object` &&
while read object
do
t=`git-cat-file -t $object` &&
- git-cat-file $t $object ||
exit
1
+ git-cat-file $t $object ||
return
1
done <obj-list
} >expect'
test_expect_success \
'pack without delta' \
done <obj-list
} >expect'
test_expect_success \
'pack without delta' \
- '
git-pack-objects --window=0 test-1 <obj-list
'
+ '
packname_1=$(git-pack-objects --window=0 test-1 <obj-list)
'
rm -fr .git2
mkdir .git2
test_expect_success \
'unpack without delta' \
rm -fr .git2
mkdir .git2
test_expect_success \
'unpack without delta' \
-
'
GIT_OBJECT_DIRECTORY=.git2/objects &&
+
"
GIT_OBJECT_DIRECTORY=.git2/objects &&
export GIT_OBJECT_DIRECTORY &&
git-init-db &&
export GIT_OBJECT_DIRECTORY &&
git-init-db &&
- git-unpack-objects test-1'
+ git-unpack-objects -n <test-1-${packname_1}.pack &&
+ git-unpack-objects <test-1-${packname_1}.pack"
unset GIT_OBJECT_DIRECTORY
cd $TRASH/.git2
unset GIT_OBJECT_DIRECTORY
cd $TRASH/.git2
@@
-57,7
+58,7
@@
test_expect_success \
do
cmp $path ../.git/$path || {
echo $path differs.
do
cmp $path ../.git/$path || {
echo $path differs.
-
exit
1
+
return
1
}
done'
cd $TRASH
}
done'
cd $TRASH
@@
-65,7
+66,7
@@
cd $TRASH
test_expect_success \
'pack with delta' \
'pwd &&
test_expect_success \
'pack with delta' \
'pwd &&
-
git-pack-objects test-2 <obj-list
'
+
packname_2=$(git-pack-objects test-2 <obj-list)
'
rm -fr .git2
mkdir .git2
rm -fr .git2
mkdir .git2
@@
-75,7
+76,8
@@
test_expect_success \
'GIT_OBJECT_DIRECTORY=.git2/objects &&
export GIT_OBJECT_DIRECTORY &&
git-init-db &&
'GIT_OBJECT_DIRECTORY=.git2/objects &&
export GIT_OBJECT_DIRECTORY &&
git-init-db &&
- git-unpack-objects test-2'
+ git-unpack-objects -n <test-2-${packname_2}.pack &&
+ git-unpack-objects <test-2-${packname_2}.pack'
unset GIT_OBJECT_DIRECTORY
cd $TRASH/.git2
unset GIT_OBJECT_DIRECTORY
cd $TRASH/.git2
@@
-86,7
+88,7
@@
test_expect_success \
do
cmp $path ../.git/$path || {
echo $path differs.
do
cmp $path ../.git/$path || {
echo $path differs.
-
exit
1
+
return
1
}
done'
cd $TRASH
}
done'
cd $TRASH
@@
-99,12
+101,12
@@
test_expect_success \
'GIT_OBJECT_DIRECTORY=.git2/objects &&
export GIT_OBJECT_DIRECTORY &&
git-init-db &&
'GIT_OBJECT_DIRECTORY=.git2/objects &&
export GIT_OBJECT_DIRECTORY &&
git-init-db &&
- cp test-1
.pack test-1
.idx .git2/objects/pack && {
+ cp test-1
-${packname_1}.pack test-1-${packname_1}
.idx .git2/objects/pack && {
git-diff-tree --root -p $commit &&
while read object
do
t=`git-cat-file -t $object` &&
git-diff-tree --root -p $commit &&
while read object
do
t=`git-cat-file -t $object` &&
- git-cat-file $t $object ||
exit
1
+ git-cat-file $t $object ||
return
1
done <obj-list
} >current &&
diff expect current'
done <obj-list
} >current &&
diff expect current'
@@
-115,12
+117,12
@@
test_expect_success \
'GIT_OBJECT_DIRECTORY=.git2/objects &&
export GIT_OBJECT_DIRECTORY &&
rm -f .git2/objects/pack/test-?.idx &&
'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 && {
+ 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-diff-tree --root -p $commit &&
while read object
do
t=`git-cat-file -t $object` &&
- git-cat-file $t $object ||
exit
1
+ git-cat-file $t $object ||
return
1
done <obj-list
} >current &&
diff expect current'
done <obj-list
} >current &&
diff expect current'
@@
-129,32
+131,32
@@
unset GIT_OBJECT_DIRECTORY
test_expect_success \
'verify pack' \
test_expect_success \
'verify pack' \
- 'git-verify-pack test-1
.idx test-2
.idx'
+ 'git-verify-pack test-1
-${packname_1}.idx test-2-${packname_2}
.idx'
test_expect_success \
'corrupt a pack and see if verify catches' \
test_expect_success \
'corrupt a pack and see if verify catches' \
- 'cp test-1.idx test-3.idx &&
- cp test-2.pack test-3.pack &&
+ 'cp test-1
-${packname_1}
.idx test-3.idx &&
+ cp test-2
-${packname_2}
.pack test-3.pack &&
if git-verify-pack test-3.idx
then false
else :;
fi &&
if git-verify-pack test-3.idx
then false
else :;
fi &&
- cp test-1.pack test-3.pack &&
+ cp test-1
-${packname_1}
.pack test-3.pack &&
dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
if git-verify-pack test-3.idx
then false
else :;
fi &&
dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=2 &&
if git-verify-pack test-3.idx
then false
else :;
fi &&
- cp test-1.pack test-3.pack &&
+ cp test-1
-${packname_1}
.pack test-3.pack &&
dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
if git-verify-pack test-3.idx
then false
else :;
fi &&
dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=7 &&
if git-verify-pack test-3.idx
then false
else :;
fi &&
- cp test-1.pack test-3.pack &&
+ cp test-1
-${packname_1}
.pack test-3.pack &&
dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
if git-verify-pack test-3.idx
then false
dd if=/dev/zero of=test-3.pack count=1 bs=1 conv=notrunc seek=12 &&
if git-verify-pack test-3.idx
then false