Merge branch 'ag/rev-parse-all-exclude-fix'

diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index b28075b65d0e732cdd80da2e46818bc3ec6bb72b..270e579c2d3a30b2a08517bc63fe6edf5221af59 100755 (executable)
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -267,32 +267,28 @@ test_expect_success 'rev-list accumulates multiple --exclude' '
        compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 '
 
-test_expect_failure 'rev-list should succeed with empty output on empty stdin' '
-       >expect &&
-       git rev-list --stdin <expect >actual &&
-       test_cmp expect actual
+test_expect_success 'rev-list should succeed with empty output on empty stdin' '
+       git rev-list --stdin </dev/null >actual &&
+       test_must_be_empty actual
 '
 
 test_expect_success 'rev-list should succeed with empty output with all refs excluded' '
-       >expect &&
        git rev-list --exclude=* --all >actual &&
-       test_cmp expect actual
+       test_must_be_empty actual
 '
 
 test_expect_success 'rev-list should succeed with empty output with empty --all' '
        (
                test_create_repo empty &&
                cd empty &&
-               >expect &&
                git rev-list --all >actual &&
-               test_cmp expect actual
+               test_must_be_empty actual
        )
 '
 
 test_expect_success 'rev-list should succeed with empty output with empty glob' '
-       >expect &&
        git rev-list --glob=does-not-match-anything >actual &&
-       test_cmp expect actual
+       test_must_be_empty actual
 '
 
 test_expect_success 'shortlog accepts --glob/--tags/--remotes' '