Merge branch 'md/filter-trees'

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 84dd1cb6907d583ec4019f1bb5b949865beac6cb..d639d946965547c86708701bfde276649c568a15 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -121,10 +121,9 @@ test_expect_success 'describe --contains defaults to HEAD without commit-ish' '
        test_cmp expect actual
 '
 
-: >err.expect
 check_describe tags/A --all A^0
 test_expect_success 'no warning was displayed for A' '
-       test_cmp err.expect err.actual
+       test_must_be_empty err.actual
 '
 
 test_expect_success 'rename tag A to Q locally' '