config.c: pass ctx with CLI config

[thirdparty/git.git] / t / t1300-config.sh

diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 86bfbc2b3642da97083e25c5cff280c0431a0dc2..387d336c91f44e58d1e5073febdae266156212c8 100755 (executable)
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -1668,6 +1668,21 @@ test_expect_success 'urlmatch' '
        test_cmp expect actual
 '
 
+test_expect_success 'urlmatch with --show-scope' '
+       cat >.git/config <<-\EOF &&
+       [http "https://weak.example.com"]
+               sslVerify = false
+               cookieFile = /tmp/cookie.txt
+       EOF
+
+       cat >expect <<-EOF &&
+       local   http.cookiefile /tmp/cookie.txt
+       local   http.sslverify false
+       EOF
+       git config --get-urlmatch --show-scope HTTP https://weak.example.com >actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'urlmatch favors more specific URLs' '
        cat >.git/config <<-\EOF &&
        [http "https://example.com/"]
@@ -2055,6 +2070,12 @@ test_expect_success '--show-origin blob ref' '
        test_cmp expect output
 '
 
+test_expect_success '--show-origin with --default' '
+       git config --show-origin --default foo some.key >actual &&
+       echo "command line:     foo" >expect &&
+       test_cmp expect actual
+'
+
 test_expect_success '--show-scope with --list' '
        cat >expect <<-EOF &&
        global  user.global=true
@@ -2123,6 +2144,12 @@ test_expect_success '--show-scope with --show-origin' '
        test_cmp expect output
 '
 
+test_expect_success '--show-scope with --default' '
+       git config --show-scope --default foo some.key >actual &&
+       echo "command   foo" >expect &&
+       test_cmp expect actual
+'
+
 test_expect_success 'override global and system config' '
        test_when_finished rm -f \"\$HOME\"/.gitconfig &&
        cat >"$HOME"/.gitconfig <<-EOF &&