Merge commit 'v1.6.0' into jc/checkout-reflog-fix

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 0dc915ea67b21d07d8e4dca44767906e05ad2278..9176484db2f78122f71c0f11889e01382effcfb9 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -15,7 +15,7 @@ test_format() {
        cat >expect.$1
        test_expect_success "format $1" "
 git rev-list --pretty=format:$2 master >output.$1 &&
-git diff expect.$1 output.$1
+test_cmp expect.$1 output.$1
 "
 }