From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH v2 7/8] alias_lookup(): optionally return top-level directory
Date: Tue, 13 Jun 2017 09:40:49 -0700 [thread overview]
Message-ID: <xmqqefun96y6.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170613114254.oo6r6oqwtchvjuim@sigill.intra.peff.net> (Jeff King's message of "Tue, 13 Jun 2017 07:42:54 -0400")
Jeff King <peff@peff.net> writes:
> On Tue, Jun 13, 2017 at 01:42:02PM +0200, Johannes Schindelin wrote:
>
>> > As you probably guessed, I had tried that first and then figured that if
>> > I needed to keep the config_key_is_valid() test anyway, I could just as
>> > well keep the strbuf around for later use.
>> >
>> > Will change the code,
>>
>> Alas, I won't change the code after all.
>>
>> It is really tempting to avoid the extra strbuf, but then the error
>> message would change from
>>
>> error: missing value for 'alias.br'
>>
>> to
>>
>> error: missing value for 'br'
>>
>> which is of course no good at all.
>>
>> And since I already have to keep that strbuf, I'll simply keep the
>> config_key_is_valid() guard, too (because why not).
>
> Oof, yeah, that is definitely worse. I'm fine with keeping both parts.
When you replace Dscho's "compare 'var' with 'alias.br' that is in
strbuf naively with the "skip-prefix and compare with br" without
changing anything else, i.e.
if (skip_prefix(var, "alias.", &key) && !strcmp(key, data->key))
return git_config_string((const char **)&data->v, key, value);
it would cause the "br" to be fed to git_config_string() and result
in problem reported for "br", not "alias.br".
But this can be trivially fixed by passing "var" instead of "key" to
git_config_string(), no? Am I mistaken?
next prev parent reply other threads:[~2017-06-13 16:40 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 19:53 [PATCH v2 0/8] Avoid problem where git_dir is set after alias expansion Johannes Schindelin
2017-06-08 19:53 ` [PATCH v2 1/8] discover_git_directory(): avoid setting invalid git_dir Johannes Schindelin
2017-06-10 8:40 ` Jeff King
2017-06-08 19:53 ` [PATCH v2 2/8] config: report correct line number upon error Johannes Schindelin
2017-06-10 9:04 ` Jeff King
2017-06-13 11:02 ` Johannes Schindelin
2017-06-13 11:28 ` Jeff King
2017-06-08 19:53 ` [PATCH v2 3/8] help: use early config when autocorrecting aliases Johannes Schindelin
2017-06-10 9:05 ` Jeff King
2017-06-08 19:53 ` [PATCH v2 4/8] read_early_config(): optionally return the worktree's top-level directory Johannes Schindelin
2017-06-10 9:44 ` Jeff King
2017-06-08 19:53 ` [PATCH v2 5/8] t1308: relax the test verifying that empty alias values are disallowed Johannes Schindelin
2017-06-10 4:29 ` Junio C Hamano
2017-06-13 10:50 ` Johannes Schindelin
2017-06-13 12:59 ` Junio C Hamano
2017-06-08 19:53 ` [PATCH v2 6/8] t7006: demonstrate a problem with aliases in subdirectories Johannes Schindelin
2017-06-08 19:53 ` [PATCH v2 7/8] alias_lookup(): optionally return top-level directory Johannes Schindelin
2017-06-10 10:18 ` Jeff King
2017-06-13 11:21 ` Johannes Schindelin
2017-06-13 11:29 ` Jeff King
2017-06-13 11:42 ` Johannes Schindelin
2017-06-13 11:42 ` Jeff King
2017-06-13 16:40 ` Junio C Hamano [this message]
2017-06-14 6:02 ` Jeff King
2017-06-14 10:03 ` Johannes Schindelin
2017-06-08 19:53 ` [PATCH v2 8/8] Use the early config machinery to expand aliases Johannes Schindelin
2017-06-10 10:07 ` Jeff King
2017-06-10 10:10 ` Jeff King
2017-06-12 20:43 ` Junio C Hamano
2017-06-13 11:25 ` Johannes Schindelin
2017-06-13 11:30 ` Jeff King
2017-06-08 22:32 ` [PATCH v2 0/8] Avoid problem where git_dir is set after alias expansion Brandon Williams
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=xmqqefun96y6.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).