Merge branch 'js/early-config' into maint

diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
index c70cf423008cfb6f3f3fd735c1f6ee2d1408de2c..c7ce5d8bb588215d528fad5dfa6aa094d2a5d468 100755 (executable)
--- a/t/t1004-read-tree-m-u-wf.sh
+++ b/t/t1004-read-tree-m-u-wf.sh
@@ -218,7 +218,7 @@ test_expect_success 'D/F' '
                echo "100644 $a 2       subdir/file2"
                echo "100644 $b 3       subdir/file2/another"
        ) >expect &&
-       test_cmp actual expect
+       test_cmp expect actual
 
 '