From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 7/8] alias_lookup(): optionally return top-level directory
Date: Tue, 13 Jun 2017 13:21:28 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1.1706131319130.171564@virtualbox> (raw)
In-Reply-To: <20170610101813.n26wmxcueicecptz@sigill.intra.peff.net>
Hi Peff,
On Sat, 10 Jun 2017, Jeff King wrote:
> On Thu, Jun 08, 2017 at 09:53:50PM +0200, Johannes Schindelin wrote:
>
> > -char *alias_lookup(const char *alias)
> > [...]
> > {
> > - char *v = NULL;
> > - struct strbuf key = STRBUF_INIT;
> > - strbuf_addf(&key, "alias.%s", alias);
> > - if (git_config_key_is_valid(key.buf))
> > - git_config_get_string(key.buf, &v);
> > - strbuf_release(&key);
> > - return v;
> > + struct strbuf key;
> > + char *v;
> > +};
> > [...]
> > +char *alias_lookup(const char *alias, struct strbuf *cdup_dir)
> > +{
> > + struct config_alias_data data = { STRBUF_INIT, NULL };
> > +
> > + strbuf_addf(&data.key, "alias.%s", alias);
> > + if (git_config_key_is_valid(data.key.buf))
> > + read_early_config(config_alias_cb, &data, cdup_dir);
> > + strbuf_release(&data.key);
> > +
> > + return data.v;
> > }
>
> Two optional cleanups here:
>
> 1. We don't need to call config_key_is_valid when using a callback. We
> only needed that to prevent the configset machinery from issuing a
> warning. It does save us reading the config entirely when the
> program name is syntactically invalid as an alias, but that's a
> pretty rare case.
It may be a pretty rare case, or it may not be. I do not want to think
hard about this, so I just wanted to keep that test.
But since you suggested it, I will simply blame all the fallout (if any)
on you.
;-)
> 2. Now that we're not using the configset machinery, we don't need to
> have the alias name as a full string. Instead of using the strbuf,
> we could just pass the "alias" string itself and do:
>
> if (skip_prefix(var, "alias.", &key) && !strcmp(key, data->key))
>
> in the callback.
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,
Dscho
next prev parent reply other threads:[~2017-06-13 11:22 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 [this message]
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
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=alpine.DEB.2.21.1.1706131319130.171564@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).