[PATCH 3/3] config: use url_parse for --url

This enables the use of the scp-style URL syntax for this option and
the depracated --get-urlmatch. Since URL matching was primarily used
for http(s) transports previously (with the potential exception of
promisor.acceptFromServerUrl), this has little internal effect and
mostly brings the behaviour of this URL argument in line with other
commands.

Signed-off-by: Fabian Pottbäcker <[email protected]>
---
 Documentation/git-config.adoc |  5 ++++
 builtin/config.c              |  2 +-
 t/t1300-config.sh             | 44 +++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-config.adoc b/Documentation/git-config.adoc
index 57af010ade..a38d68512e 100644
--- a/Documentation/git-config.adoc
+++ b/Documentation/git-config.adoc
@@ -143,6 +143,11 @@ permitted).
 	<section>.<key> is used as a fallback).  When given just the
 	<section> as name, do so for all the keys in the section and
 	list them.  Returns error code 1 if no value is found.
++
+This option supports all URL formats (see linkgit:git-fetch[1]),
+unlike the config file URL syntax explained in the `http.<url>.*`
+options, which requires an explicitly specified scheme and does
+not support the scp-style URL syntax.
 
 --global::
 	For writing options: write to global `~/.gitconfig` file
diff --git a/builtin/config.c b/builtin/config.c
index 8d8ec0beea..b5488a9497 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -870,7 +870,7 @@ static int get_urlmatch(const struct config_location_options *opts,
 	config.cascade_fn = NULL;
 	config.cb = &values;
 
-	if (!url_normalize(url, &config.url))
+	if (!url_parse(url, &config.url))
 		die("%s", config.url.err);
 
 	config.section = section = xstrdup_tolower(var);
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 8310fe6a65..477e030cf3 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -1907,6 +1907,50 @@ test_expect_success 'urlmatch' '
 	test_cmp expect actual
 '
 
+test_expect_success 'urlmatch with scp syntax' '
+	cat >.git/config <<-\EOF &&
+	[section]
+		flag = false
+	[section "ssh://example.com"]
+		flag = true
+		key = value
+	EOF
+
+	echo "fatal: invalid URL scheme name or missing '"'"'://'"'"' suffix" >expect_err &&
+	test_expect_code 128 git config --bool --get-urlmatch section.flag example.com >actual 2>error &&
+	test_cmp expect_err error &&
+	test_must_be_empty actual &&
+	test_expect_code 128 git config get --url=example.com --bool section.flag >actual 2>error &&
+	test_cmp expect_err error &&
+	test_must_be_empty actual &&
+
+	test_expect_code 1 git config --bool --get-urlmatch doesnt.exist example.com: >actual &&
+	test_must_be_empty actual &&
+	test_expect_code 1 git config get --url=example.com: --bool doesnt.exist >actual &&
+	test_must_be_empty actual &&
+
+	echo true >expect &&
+	git config --bool --get-urlmatch section.flag [email protected]:path >actual &&
+	test_cmp expect actual &&
+	git config get --bool [email protected]:path section.flag >actual &&
+	test_cmp expect actual &&
+
+	echo false >expect &&
+	git config --bool --get-urlmatch section.flag https://example.com >actual &&
+	test_cmp expect actual &&
+	git config get --bool --url=https://example.com section.flag >actual &&
+	test_cmp expect actual &&
+
+	{
+		echo section.flag true &&
+		echo section.key value
+	} >expect &&
+	git config --get-urlmatch section [email protected]:path >actual &&
+	test_cmp expect actual &&
+	git config get [email protected]:path section >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'urlmatch with --show-scope' '
 	cat >.git/config <<-\EOF &&
 	[http "https://weak.example.com"]
-- 
2.50.1 (Apple Git-155)