Merge branch 'maint'

diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
index be3d238d996fed911d6098fad01ca25345059da6..52f7b277ceae3ae183bc6082c01af9f76bd39a86 100755 (executable)
--- a/t/t6009-rev-list-parent.sh
+++ b/t/t6009-rev-list-parent.sh
@@ -18,7 +18,7 @@ test_expect_success setup '
 
        commit one &&
 
-       test_tick=$(($test_tick - 2400))
+       test_tick=$(($test_tick - 2400)) &&
 
        commit two &&
        commit three &&
@@ -27,11 +27,11 @@ test_expect_success setup '
        git log --pretty=oneline --abbrev-commit
 '
 
-test_expect_failure 'one is ancestor of others and should not be shown' '
+test_expect_success 'one is ancestor of others and should not be shown' '
 
        git rev-list one --not four >result &&
        >expect &&
-       diff -u expect result
+       test_cmp expect result
 
 '