From: Derrick Stolee <firstname.lastname@example.org>
To: Emily Shaffer <email@example.com>,
Junio C Hamano <firstname.lastname@example.org>
Subject: Re: ds/maintenance-part-3 (was Re: What's cooking in git.git (Nov 2020, #02; Mon, 9))
Date: Tue, 17 Nov 2020 08:56:16 -0500 [thread overview]
Message-ID: <email@example.com> (raw)
On 11/16/2020 8:07 PM, Emily Shaffer wrote:
> On Mon, Nov 16, 2020 at 04:40:35PM -0800, Junio C Hamano wrote:
>> Emily Shaffer <firstname.lastname@example.org> writes:
>>> Because 'git maintenance unregister' spins a child process to call 'git
>>> config --unset maintenance.repo <cwd>', it actually fails if "cwd"
>>> contains a POSIX regular expression special character:
>>> git config [<file-option>] --unset name [value_regex]
>> Good find. And it is even worse that value_regex uses ERE, not BRE,
>> which means even an otherwise innocuous letter like '+' cannot be
>> used without quoting.
> I should have mentioned in the first letter than Jonathan Nieder was the
> one who made the jump from "this is breaking in the buildbot but not
> locally" to regular expression metachars. Credit where it's due.
Thank you for finding and reporting this bug.
Can I at least have a short moment of griping about anyone putting
regex characters into their directory names? ;)
>>> You can demo it for yourself like so:
>>> git init repro+for+maintenance
>>> git maintenance register
>>> git maintenance unregister
>>> echo $? # returns '5'
>>> git config --list --global
>>> I see two paths forward:
>> 0. Quote the value_regex properly, instead of blindly using a value
>> that comes from the environment.
Pulling the subcommand from my test enfironment using GIT_TRACE2_PERF=1
I see the following quotes being used:
git config --global --unset maintenance.repo "/repos/new+repo*test"
I'm guessing that what we really want is to _escape_ the regex glob
characters? This command works:
git config --global --unset maintenance.repo "/repos/new\+repo\*test"
The only place I see where we do that currently is in
builtin/sparse-checkout.c:escaped_pattern(). Please let me know if
you know of a more suitable way to escape regex characters.
>>> 1. Teach 'git config' to learn either which regex parser to use
>>> (including fixed), or at least to learn "value isn't a regex", or
>>> 2. Don't spin a child process in 'git maintenance [un]register' and
>>> instead just call the config API.
>>> I'd suggest #2. The config API is very nice, and seems to have a simple
>>> way to add or remove configs to your global file in just a couple of
>>> lines. If there's a reason why it's not simpler to do it that way, it's
>>> my fault for missing the review :)
>> My short-to-mid-term preference is to do #1 to allow a value to be
>> spelled literally (i.e. remove entry with _this_ value, and add this
>> one instead), and optionally do #2 as an optimization that is not
>> essential. I do not offhand know how you can make #2 alone fly
>> without doing some form of #1, as I think the same value_regex that
>> ought to be ERE to specify entries to be replaced needs to be used
>> under the cover even if you use "config API" anyway.
> Ah, right you are - I had figured the regex parsing was done earlier,
> but it indeed looks to happen in
> config.c:git_config_set_multivar_in_file_gently. Thanks.
So the "real fix" is to allow a command-line option to 'git config'
that makes the "value_regex" parameter a literal string? Of course,
this would either require wiring an option down into
git_config_set_multivar_in_file_gently() to treat the string as a
literal _or_ to escape the input string in builtin/config.c.
Am I understanding the intended plan here?
next prev parent reply other threads:[~2020-11-17 13:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 23:42 What's cooking in git.git (Nov 2020, #02; Mon, 9) Junio C Hamano
2020-11-10 0:44 ` Elijah Newren
2020-11-10 1:03 ` Jeff King
2020-11-10 13:31 ` ds/maintenance-part-3 (was Re: What's cooking in git.git (Nov 2020, #02; Mon, 9)) Derrick Stolee
2020-11-16 23:56 ` Emily Shaffer
2020-11-17 0:40 ` Junio C Hamano
2020-11-17 1:07 ` Emily Shaffer
2020-11-17 13:56 ` Derrick Stolee [this message]
2020-11-17 19:18 ` Emily Shaffer
2020-11-17 19:34 ` Junio C Hamano
2020-11-17 21:12 ` Derrick Stolee
2020-11-19 2:16 ` Junio C Hamano
2020-11-19 13:25 ` Derrick Stolee
2020-11-19 15:53 ` Derrick Stolee
2020-11-19 18:06 ` Junio C Hamano
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:
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 \
* 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
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).