Merge branch 'js/mingw-http-ssl'

diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index b97357b8ab3aa47aff100e4012083891b57d9b46..413642aa5672800d1b7be448bc97d175add07ee4 100755 (executable)
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -6,7 +6,7 @@ test_description='Test read_early_config()'
 
 test_expect_success 'read early config' '
        test_config early.config correct &&
-       test-config read_early_config early.config >output &&
+       test-tool config read_early_config early.config >output &&
        test correct = "$(cat output)"
 '
 
@@ -15,7 +15,7 @@ test_expect_success 'in a sub-directory' '
        mkdir -p sub &&
        (
                cd sub &&
-               test-config read_early_config early.config
+               test-tool config read_early_config early.config
        ) >output &&
        test sub = "$(cat output)"
 '
@@ -27,7 +27,7 @@ test_expect_success 'ceiling' '
                GIT_CEILING_DIRECTORIES="$PWD" &&
                export GIT_CEILING_DIRECTORIES &&
                cd sub &&
-               test-config read_early_config early.config
+               test-tool config read_early_config early.config
        ) >output &&
        test -z "$(cat output)"
 '
@@ -42,24 +42,42 @@ test_expect_success 'ceiling #2' '
                GIT_CEILING_DIRECTORIES="$PWD" &&
                export GIT_CEILING_DIRECTORIES XDG_CONFIG_HOME &&
                cd sub &&
-               test-config read_early_config early.config
+               test-tool config read_early_config early.config
        ) >output &&
        test xdg = "$(cat output)"
 '
 
+cmdline_config="'test.source=cmdline'"
+test_expect_success 'read config file in right order' '
+       echo "[test]source = home" >>.gitconfig &&
+       git init foo &&
+       (
+               cd foo &&
+               echo "[test]source = repo" >>.git/config &&
+               GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config \
+                       read_early_config test.source >actual &&
+               cat >expected <<-\EOF &&
+               home
+               repo
+               cmdline
+               EOF
+               test_cmp expected actual
+       )
+'
+
 test_with_config () {
        rm -rf throwaway &&
        git init throwaway &&
        (
                cd throwaway &&
                echo "$*" >.git/config &&
-               test-config read_early_config early.config
+               test-tool config read_early_config early.config
        )
 }
 
 test_expect_success 'ignore .git/ with incompatible repository version' '
        test_with_config "[core]repositoryformatversion = 999999" 2>err &&
-       grep "warning:.* Expected git repo version <= [1-9]" err
+       test_i18ngrep "warning:.* Expected git repo version <= [1-9]" err
 '
 
 test_expect_failure 'ignore .git/ with invalid repository version' '