Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maint

diff --git a/t/t6013-rev-list-reverse-parents.sh b/t/t6013-rev-list-reverse-parents.sh
index 59fc2f06e0b5895af60b6eb4084fe7a38d3aa948..89458d370f5f05d245ba57e430b7b97dd5880639 100755 (executable)
--- a/t/t6013-rev-list-reverse-parents.sh
+++ b/t/t6013-rev-list-reverse-parents.sh
@@ -28,7 +28,7 @@ test_expect_success '--reverse --parents --full-history combines correctly' '
                perl -e "print reverse <>" > expected &&
        git rev-list --reverse --parents --full-history master -- foo \
                > actual &&
-       test_cmp actual expected
+       test_cmp expected actual
        '
 
 test_expect_success '--boundary does too' '
@@ -36,7 +36,7 @@ test_expect_success '--boundary does too' '
                perl -e "print reverse <>" > expected &&
        git rev-list --boundary --reverse --parents --full-history \
                master ^root -- foo > actual &&
-       test_cmp actual expected
+       test_cmp expected actual
        '
 
 test_done