t7810: use test_expect_code() instead of hand-rolled comparison
[gitweb.git] / t / t7201-co.sh
index 76c223c9675cd1531ac078fa9e0c1f8cc4e09781..8d8a63a24be023b2a615bed1aa51c6812d8cbb83 100755 (executable)
@@ -65,7 +65,7 @@ test_expect_success setup '
 test_expect_success "checkout from non-existing branch" '
 
        git checkout -b delete-me master &&
-       rm .git/refs/heads/delete-me &&
+       git update-ref -d --no-deref refs/heads/delete-me &&
        test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
        git checkout master &&
        test refs/heads/master = "$(git symbolic-ref HEAD)"
@@ -673,7 +673,6 @@ test_expect_success 'custom merge driver with checkout -m' '
                do
                        grep $t arm || exit 1
                done
-               exit 0
        ) &&
 
        mv arm expect &&