From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: Lars Schneider <larsxschneider@gmail.com>,
git@vger.kernel.org, sbeller@google.com
Subject: [PATCH] config: preserve <subsection> case for one-shot config on the command line
Date: Wed, 15 Feb 2017 15:48:44 -0800 [thread overview]
Message-ID: <xmqqa89n10df.fsf_-_@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqtw7v123n.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 15 Feb 2017 15:11:24 -0800")
The "git -c <var>=<val> cmd" mechanism is to pretend that a
configuration variable <var> is set to <val> while the cmd is
running. The code to do so however downcased <var> in its entirety,
which is wrong for a three-level <section>.<subsection>.<variable>.
The <subsection> part needs to stay as-is.
Reported-by: Lars Schneider <larsxschneider@gmail.com>
Diagnosed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
config.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/config.c b/config.c
index 0dfed682b8..e9b93b5304 100644
--- a/config.c
+++ b/config.c
@@ -199,6 +199,26 @@ void git_config_push_parameter(const char *text)
strbuf_release(&env);
}
+/*
+ * downcase the <section> and <variable> in <section>.<variable> or
+ * <section>.<subsection>.<variable> and do so in place. <subsection>
+ * is left intact.
+ */
+static void canonicalize_config_variable_name(char *varname)
+{
+ char *dot, *cp;
+
+ dot = strchr(varname, '.');
+ if (dot)
+ for (cp = varname; cp < dot; cp++)
+ *cp = tolower(*cp);
+ dot = strrchr(varname, '.');
+ if (dot)
+ for (cp = dot + 1; *cp; cp++)
+ *cp = tolower(*cp);
+}
+
+
int git_config_parse_parameter(const char *text,
config_fn_t fn, void *data)
{
@@ -221,7 +241,7 @@ int git_config_parse_parameter(const char *text,
strbuf_list_free(pair);
return error("bogus config parameter: %s", text);
}
- strbuf_tolower(pair[0]);
+ canonicalize_config_variable_name(pair[0]->buf);
if (fn(pair[0]->buf, value, data) < 0) {
strbuf_list_free(pair);
return -1;
--
2.12.0-rc1-258-g3d3d1e383b
next prev parent reply other threads:[~2017-02-15 23:49 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 11:17 [BUG] submodule config does not apply to upper case submodules? Lars Schneider
2017-02-15 11:33 ` [PATCH v1] t7400: cleanup "submodule add clone shallow submodule" test Lars Schneider
2017-02-15 18:29 ` Stefan Beller
2017-02-15 18:39 ` Junio C Hamano
2017-02-15 18:14 ` [BUG] submodule config does not apply to upper case submodules? Stefan Beller
2017-02-15 18:53 ` Junio C Hamano
2017-02-15 22:54 ` Jonathan Tan
2017-02-15 23:02 ` Junio C Hamano
2017-02-15 23:11 ` Junio C Hamano
2017-02-15 23:28 ` Stefan Beller
2017-02-15 23:37 ` Junio C Hamano
2017-02-15 23:43 ` Stefan Beller
2017-02-15 23:53 ` Junio C Hamano
2017-02-16 23:22 ` Jeff King
2017-02-15 23:33 ` Jonathan Tan
2017-02-16 18:49 ` Junio C Hamano
2017-02-15 23:48 ` Junio C Hamano [this message]
2017-02-16 10:30 ` [PATCH] config: preserve <subsection> case for one-shot config on the command line Lars Schneider
2017-02-16 16:59 ` Junio C Hamano
2017-02-16 23:27 ` Jeff King
2017-02-17 1:25 ` Junio C Hamano
2017-02-20 9:58 ` Junio C Hamano
2017-02-20 17:17 ` Lars Schneider
2017-02-21 7:38 ` Jeff King
2017-02-21 17:01 ` Junio C Hamano
2017-02-21 17:17 ` [PATCH v2] " Junio C Hamano
2017-02-21 17:50 ` Jeff King
2017-02-21 17:57 ` Stefan Beller
2017-02-21 18:53 ` [PATCH] config: reject invalid VAR in 'git -c VAR=VAL command' Junio C Hamano
2017-02-21 19:15 ` Stefan Beller
2017-02-21 20:33 ` Junio C Hamano
2017-02-21 21:24 ` [PATCH v2] " Junio C Hamano
2017-02-22 1:06 ` Junio C Hamano
2017-02-23 5:58 ` Jeff King
2017-02-23 7:19 ` Junio C Hamano
2017-02-23 23:19 ` Junio C Hamano
2017-02-24 0:41 ` Jeff King
2017-02-24 4:17 ` Junio C Hamano
2017-02-24 4:22 ` Jeff King
2017-02-24 6:08 ` Junio C Hamano
2017-02-24 6:10 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa89n10df.fsf_-_@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=larsxschneider@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).