index c154f03cf5f80198b9b8d19f6b0c04db11c79965..6a6a13002d3dc66c043a43df910a79940b178da4 100755 (executable)
GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
'
GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
'
-test_expect_failure "combined merge conflicts" "git merge -m final G"
+test_expect_success "combined merge conflicts" "! git merge -m final G"
cat > expect << EOF
<<<<<<< HEAD:a1
cat > expect << EOF
<<<<<<< HEAD:a1
>>>>>>> G:a1
EOF
>>>>>>> G:a1
EOF
-test_expect_success "result contains a conflict" "git diff expect a1"
+test_expect_success "result contains a conflict" "test_cmp expect a1"
git ls-files --stage > out
cat > expect << EOF
git ls-files --stage > out
cat > expect << EOF
100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
EOF
100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
EOF
-test_expect_success "virtual trees were processed" "git diff expect out"
+test_expect_success "virtual trees were processed" "test_cmp expect out"
-git reset --hard
test_expect_success 'refuse to merge binary files' '
test_expect_success 'refuse to merge binary files' '
+ git reset --hard &&
printf "\0" > binary-file &&
git add binary-file &&
git commit -m binary &&
printf "\0" > binary-file &&
git add binary-file &&
git commit -m binary &&