From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Brandon Williams <bmwill@google.com>, git <git@vger.kernel.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
peff <peff@google.com>
Subject: Re: [PATCH 2/3] config: fix case sensitive subsection names on writing
Date: Thu, 2 Aug 2018 17:30:10 -0700 [thread overview]
Message-ID: <CAGZ79kbeUHVQmfTFkoGEM617iVa_3mCsLjpYGoEebqxNKAM_xA@mail.gmail.com> (raw)
In-Reply-To: <xmqqva8t4s63.fsf@gitster-ct.c.googlers.com>
On Wed, Aug 1, 2018 at 3:51 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Stefan Beller <sbeller@google.com> writes:
>
> > A use reported a submodule issue regarding strange case indentation
> > issues, but it could be boiled down to the following test case:
>
> Perhaps
>
> s/use/user/
> s/case indentation issues/section mix-up/
will be fixed in a reroll
>
> > ... 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)
>
> s/unnoticed in \(.*04-09)\)/unnoticed when \1 broke it./
>
> This is why I asked if the patch is a "FIX" for an issue introduced
> by the cited commit.
I did not check further down the history if it was a recent brakage.
> > static int get_base_var(struct strbuf *name)
> > {
> > + cf->section_name_old_dot_style = 1;
> > for (;;) {
> > int c = get_next_char();
> > if (cf->eof)
>
> OK, let me rephrase. The basic parse structure is that
>
> * upon seeing '[', we call get_base_var(), which stuffs the
> "section" (including subsection, if exists) in the strbuf.
>
> * get_base_var() upon seeing a space after "[section ", calls
> get_extended_base_var(). This space can never exist in an
> old-style three-level names, where it is spelled as
> "[section.subsection]". This space cannot exist in two-level
> names, either. The closing ']' is eaten by this function before
> it returns.
>
> * get_extended_base_var() grabs the "double quoted" subsection name
> and eats the closing ']' before it returns.
>
> So you set the new bit (section_name_old_dot_style) at the beginning
> of get_base_var(), i.e. declare that you assume we are reading old
> style, but upon entering get_extended_base_var(), unset it, because
> now you know we are parsing a modern style three-level name(s).
>
> Feels quite sensible way to keep track of old/new styles.
>
> When parsing two-level names, old-style bit is set, which we may
> need to be careful, thoguh.
I considered setting it only when seeing the dot, but then we'd have
to make sure it is properly initialized.
And *technically* the two level is old style, so I figured it's ok.
> > - !strncasecmp(cf->var.buf, store->key, store->baselen);
> > + !cmpfn(cf->var.buf, store->key, store->baselen);
>
> OK. Section names should still be case insensitive (only the case
> sensitivity of subsection names is special), but presumably that's
> already normalized by the caller so we do not have to worry when we
> use strncmp()? Can we add a test to demonstrate that it works
> correctly?
That was already demonstrated (but not tested) in
https://public-inbox.org/git/20180730230443.74416-4-sbeller@google.com/
next prev parent reply other threads:[~2018-08-03 0:30 UTC|newest]
Thread overview: 34+ 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
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 [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2018-08-08 19:50 [PATCH 0/3] Resending sb/config-write-fix Stefan Beller
2018-08-08 19:50 ` [PATCH 2/3] config: fix case sensitive subsection names on writing Stefan Beller
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=CAGZ79kbeUHVQmfTFkoGEM617iVa_3mCsLjpYGoEebqxNKAM_xA@mail.gmail.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--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).