check_result () {
git ls-files --stage | sed -e 's/ '"$_x40"' / X /' >current &&
- git diff expected current
+ test_cmp expected current
}
# This is done on an empty work directory, which is the normal
rm -f .git/index XX &&
echo XX >XX &&
git update-index --add XX &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/AN AN &&
echo extra >>AN &&
git update-index --add AN &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/AA AA &&
git update-index --add AA &&
echo extra >>AA &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/AA AA &&
echo extra >>AA &&
git update-index --add AA &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/LL LL &&
echo extra >>LL &&
git update-index --add LL &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
rm -f .git/index DD &&
echo DD >DD
git update-index --add DD &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
rm -f .git/index DM &&
cp .orig-B/DM DM &&
git update-index --add DM &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
rm -f .git/index DN &&
cp .orig-B/DN DN &&
git update-index --add DN &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/MD MD &&
git update-index --add MD &&
echo extra >>MD &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/MD MD &&
echo extra >>MD &&
git update-index --add MD &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/ND ND &&
git update-index --add ND &&
echo extra >>ND &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/ND ND &&
echo extra >>ND &&
git update-index --add ND &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/MM MM &&
git update-index --add MM &&
echo extra >>MM &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/MM MM &&
echo extra >>MM &&
git update-index --add MM &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/SS SS &&
echo extra >>SS &&
git update-index --add SS &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/NM NM &&
git update-index --add NM &&
echo extra >>NM &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/NM NM &&
echo extra >>NM &&
git update-index --add NM &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
test_expect_success \
cp .orig-A/NN NN &&
echo extra >>NN &&
git update-index --add NN &&
- ! git read-tree -m $tree_O $tree_A $tree_B
+ test_must_fail git read-tree -m $tree_O $tree_A $tree_B
"
# #16