Merge branch 'sg/test-rebase-editor-fix' into maint

diff --git a/t/t3004-ls-files-basic.sh b/t/t3004-ls-files-basic.sh
index 9c7adbdbe1cd7bf03e9b8f10a75f0acb4f37a5b2..9fd5a1f188aae0507c335de65a742977c6976d69 100755 (executable)
--- a/t/t3004-ls-files-basic.sh
+++ b/t/t3004-ls-files-basic.sh
@@ -8,16 +8,14 @@ command-line arguments.
 
 . ./test-lib.sh
 
->empty
-
 test_expect_success 'ls-files in empty repository' '
        git ls-files >actual &&
-       test_cmp empty actual
+       test_must_be_empty actual
 '
 
 test_expect_success 'ls-files with nonexistent path' '
        git ls-files doesnotexist >actual &&
-       test_cmp empty actual
+       test_must_be_empty actual
 '
 
 test_expect_success 'ls-files with nonsense option' '