t1010: use BROKEN_OBJECTS prerequisite
When hash compatibility mode is enabled, we cannot write broken objects because they cannot be mapped into the other hash algorithm. Use the BROKEN_OBJECTS prerequisite to disable these tests and the writing of broken objects in this mode. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>main
parent
5f23aa6f0f
commit
db00605c13
|
|
@ -11,10 +11,13 @@ test_expect_success setup '
|
||||||
git add "$d" || return 1
|
git add "$d" || return 1
|
||||||
done &&
|
done &&
|
||||||
echo zero >one &&
|
echo zero >one &&
|
||||||
git update-index --add --info-only one &&
|
if test_have_prereq BROKEN_OBJECTS
|
||||||
git write-tree --missing-ok >tree.missing &&
|
then
|
||||||
git ls-tree $(cat tree.missing) >top.missing &&
|
git update-index --add --info-only one &&
|
||||||
git ls-tree -r $(cat tree.missing) >all.missing &&
|
git write-tree --missing-ok >tree.missing &&
|
||||||
|
git ls-tree $(cat tree.missing) >top.missing &&
|
||||||
|
git ls-tree -r $(cat tree.missing) >all.missing
|
||||||
|
fi &&
|
||||||
echo one >one &&
|
echo one >one &&
|
||||||
git add one &&
|
git add one &&
|
||||||
git write-tree >tree &&
|
git write-tree >tree &&
|
||||||
|
|
@ -53,7 +56,7 @@ test_expect_success 'ls-tree output in wrong order given to mktree (2)' '
|
||||||
test_cmp tree.withsub actual
|
test_cmp tree.withsub actual
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'allow missing object with --missing' '
|
test_expect_success BROKEN_OBJECTS 'allow missing object with --missing' '
|
||||||
git mktree --missing <top.missing >actual &&
|
git mktree --missing <top.missing >actual &&
|
||||||
test_cmp tree.missing actual
|
test_cmp tree.missing actual
|
||||||
'
|
'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue