From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH] config: fix case sensitive subsection names on writing
Date: Fri, 27 Jul 2018 13:51:17 -0700 [thread overview]
Message-ID: <20180727205117.243770-1-sbeller@google.com> (raw)
A use reported a submodule issue regarding strange case indentation
issues, but it could be boiled down to the following test case:
$ git init test && cd test
$ git config foo."Bar".key test
$ git config foo."bar".key test
$ tail -n 3 .git/config
[foo "Bar"]
key = test
key = test
Sub sections are case sensitive and we have a test for correctly reading
them. However we do not have a test for writing out config correctly with
case sensitive subsection names, which is why this went unnoticed in
6ae996f2acf (git_config_set: make use of the config parser's event
stream, 2018-04-09)
Make the subsection case sensitive and provide a test for both reading
and writing.
Reported-by: JP Sugarbroad <jpsugar@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
config.c | 2 +-
t/t1300-config.sh | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/config.c b/config.c
index 3aacddfec4b..3ded92b678b 100644
--- a/config.c
+++ b/config.c
@@ -2374,7 +2374,7 @@ static int store_aux_event(enum config_event_t type,
store->is_keys_section =
store->parsed[store->parsed_nr].is_keys_section =
cf->var.len - 1 == store->baselen &&
- !strncasecmp(cf->var.buf, store->key, store->baselen);
+ !strncmp(cf->var.buf, store->key, store->baselen);
if (store->is_keys_section) {
store->section_seen = 1;
ALLOC_GROW(store->seen, store->seen_nr + 1,
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 03c223708eb..8325d4495f4 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -1218,6 +1218,24 @@ test_expect_success 'last one wins: three level vars' '
test_cmp expect actual
'
+test_expect_success 'setting different case subsections ' '
+ test_when_finished "rm -f caseSens caseSens_actual caseSens_expect" &&
+
+ # v.a.r and v.A.r are not the same variable, as the middle
+ # level of a three-level configuration variable name is
+ # case sensitive.
+ git config -f caseSens v."A".r VAL &&
+ git config -f caseSens v."a".r val &&
+
+ echo VAL >caseSens_expect &&
+ git config -f caseSens v."A".r >caseSens_actual &&
+ test_cmp caseSens_expect caseSens_actual &&
+
+ echo val >caseSens_expect &&
+ git config -f caseSens v."a".r >caseSens_actual &&
+ test_cmp caseSens_expect caseSens_actual
+'
+
for VAR in a .a a. a.0b a."b c". a."b c".0d
do
test_expect_success "git -c $VAR=VAL rejects invalid '$VAR'" '
--
2.18.0.345.g5c9ce644c3-goog
next reply other threads:[~2018-07-27 20:51 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 20:51 Stefan Beller [this message]
2018-07-27 21:21 ` [PATCH] config: fix case sensitive subsection names on writing Brandon Williams
2018-07-27 21:39 ` Junio C Hamano
2018-07-27 23:35 ` Stefan Beller
2018-07-27 23:36 ` Stefan Beller
2018-07-27 23:37 ` Stefan Beller
2018-07-28 1:01 ` Junio C Hamano
2018-07-28 3:52 ` Stefan Beller
2018-07-28 10:53 ` Jeff King
2018-07-28 1:37 ` Junio C Hamano
2018-07-30 12:49 ` Johannes Schindelin
2018-07-30 23:04 ` [PATCH 0/3] " Stefan Beller
2018-07-30 23:04 ` [PATCH 1/3] t1300: document current behavior of setting options Stefan Beller
2018-07-30 23:04 ` [PATCH 2/3] config: fix case sensitive subsection names on writing Stefan Beller
2018-07-31 20:16 ` Junio C Hamano
2018-07-30 23:04 ` [PATCH 3/3] config: treat section case insensitive in store_aux_event Stefan Beller
2018-07-31 15:16 ` [PATCH 0/3] config: fix case sensitive subsection names on writing Junio C Hamano
2018-08-01 19:34 ` [PATCH 0/3] sb/config-write-fix done without robbing Peter Stefan Beller
2018-08-01 19:34 ` [PATCH 1/3] t1300: document current behavior of setting options Stefan Beller
2018-08-01 19:34 ` [PATCH 2/3] config: fix case sensitive subsection names on writing Stefan Beller
2018-08-01 21:01 ` Ramsay Jones
2018-08-01 22:26 ` Junio C Hamano
2018-08-01 22:51 ` Junio C Hamano
2018-08-03 0:30 ` Stefan Beller
2018-08-03 15:51 ` Junio C Hamano
2018-08-01 19:34 ` [PATCH 3/3] git-config: document accidental multi-line setting in deprecated syntax Stefan Beller
2018-08-01 19:58 ` [PATCH 0/3] sb/config-write-fix done without robbing Peter Eric Sunshine
2018-08-02 19:49 ` Junio C Hamano
2018-08-03 0:34 ` [PATCH 0/3] Reroll of sb/config-write-fix Stefan Beller
2018-08-03 0:34 ` [PATCH 1/3] t1300: document current behavior of setting options Stefan Beller
2018-08-03 0:34 ` [PATCH 2/3] config: fix case sensitive subsection names on writing Stefan Beller
2018-08-03 0:34 ` [PATCH 3/3] git-config: document accidental multi-line setting in deprecated syntax Stefan Beller
2018-07-27 21:37 ` [PATCH] config: fix case sensitive subsection names on writing Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180727205117.243770-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.