Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
index f248a3293c5d126c60dc525e410e99d5c48a8c04..c8a96a9a994badde602c8bf7a7decda048a00525 100755 (executable)
--- a/t/t6009-rev-list-parent.sh
+++ b/t/t6009-rev-list-parent.sh
@@ -27,7 +27,7 @@ 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 &&