From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: bmwill@google.com, peff@google.com, Johannes.Schindelin@gmx.de,
gitster@pobox.com, Stefan Beller <sbeller@google.com>
Subject: [PATCH] config: fix case sensitive subsection names on writing
Date: Fri, 27 Jul 2018 16:36:06 -0700 [thread overview]
Message-ID: <20180727233606.179965-1-sbeller@google.com> (raw)
In-Reply-To: <CAGZ79kaVS96_K-G-_hEnRecBS843tjn7=Am0xZQjZABCdC7L0A@mail.gmail.com>
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 writing.
The test for reading is just above this test.
Reported-by: JP Sugarbroad <jpsugar@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
I really appreciate the work by DScho (and Peff as I recall him as an active
reviewer there) on 4f4d0b42bae (Merge branch 'js/empty-config-section-fix',
2018-05-08), as the corner cases are all correct, modulo the one line fix
in this patch.
Thanks,
Stefan
config.c | 2 +-
t/t1300-config.sh | 57 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/config.c b/config.c
index 7968ef7566a..de646d2c56f 100644
--- a/config.c
+++ b/config.c
@@ -2362,7 +2362,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..710e2b04ad8 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -1218,6 +1218,63 @@ test_expect_success 'last one wins: three level vars' '
test_cmp expect actual
'
+test_expect_success 'old-fashioned settings are case insensitive' '
+ test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
+
+ cat >testConfig <<-EOF &&
+ # insensitive:
+ [V.A]
+ r = value1
+ EOF
+ q_to_tab >testConfig_expect <<-EOF &&
+ # insensitive:
+ [V.A]
+ Qr = value2
+ EOF
+
+ for key in "v.a.r" "V.A.r" "v.A.r" "V.a.r"
+ do
+ cp testConfig testConfig_actual &&
+ git config -f testConfig_actual v.a.r value2 &&
+ test_cmp testConfig_expect testConfig_actual
+ done
+'
+
+test_expect_success 'setting different case sensitive subsections ' '
+ test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
+
+ cat >testConfig <<-EOF &&
+ # V insensitive A sensitive:
+ [V "A"]
+ r = value1
+ # same as above:
+ [V "a"]
+ r = value2
+ EOF
+
+ git config -f testConfig v.a.r value3 &&
+ q_to_tab >testConfig_expect <<-EOF &&
+ # V insensitive A sensitive:
+ [V "A"]
+ r = value1
+ # same as above:
+ [V "a"]
+ Qr = value3
+ EOF
+ test_cmp testConfig_expect testConfig &&
+
+ git config -f testConfig v.A.r value4 &&
+ q_to_tab >testConfig_expect <<-EOF &&
+ # V insensitive A sensitive:
+ [V "A"]
+ Qr = value4
+ # same as above:
+ [V "a"]
+ Qr = value3
+ EOF
+ test_cmp testConfig_expect testConfig
+'
+
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 prev parent reply other threads:[~2018-07-27 23:36 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 20:51 [PATCH] config: fix case sensitive subsection names on writing Stefan Beller
2018-07-27 21:21 ` Brandon Williams
2018-07-27 21:39 ` Junio C Hamano
2018-07-27 23:35 ` Stefan Beller
2018-07-27 23:36 ` Stefan Beller [this message]
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
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=20180727233606.179965-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@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).