From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Jeff King <peff@peff.net>
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
sschuberth@gmail.com
Subject: Re: [PATCH v3] config: add conditional include
Date: Wed, 13 Jul 2016 14:48:45 +0200 [thread overview]
Message-ID: <vpqmvllhff6.fsf@anie.imag.fr> (raw)
In-Reply-To: <20160713072607.GA15153@sigill.intra.peff.net> (Jeff King's message of "Wed, 13 Jul 2016 03:26:07 -0400")
Jeff King <peff@peff.net> writes:
> On Wed, Jul 13, 2016 at 09:21:37AM +0200, Matthieu Moy wrote:
>
>> > +static int prepare_include_condition_pattern(struct strbuf *pat)
>> > +{
>> > + int prefix = 0;
>> > +
>> > + /* TODO: maybe support ~user/ too */
>> > + if (pat->buf[0] == '~' && is_dir_sep(pat->buf[1])) {
>> > + struct strbuf path = STRBUF_INIT;
>> > + const char *home = getenv("HOME");
>> > +
>> > + if (!home)
>> > + return error(_("$HOME is not defined"));
>>
>> expand_user_path in path.c seems to do the same as you're doing (but
>> does deal with ~user). Any reason not to use it?
>
> I had a similar question, which Duy answered in:
>
> http://article.gmane.org/gmane.comp.version-control.git/298528
>
> It does feel pretty hacky, though (especially for a case that seems
> unlikely to come up: people having wildcard patterns in the name of
> their home directory).
Ah, OK. Then I'd suggest at least an improvement in the comment:
/*
- * perform literal matching on the prefix part so that
- * any wildcard character in it can't create side effects.
+ * perform literal matching on the expanded prefix part
+ * so that any wildcard character in it (e.g in the
+ * expansion of ~) can't create side effects.
*/
I would also rename the variable prefix -> expanded_prefix. As-is, the
code is really hard to understand IMHO.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2016-07-13 12:52 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-26 7:06 [PATCH] config: add conditional include Nguyễn Thái Ngọc Duy
2016-06-26 18:27 ` Jeff King
2016-06-27 16:14 ` Duy Nguyen
2016-06-27 16:20 ` Jeff King
2016-06-27 16:32 ` Duy Nguyen
2016-06-27 16:35 ` Jeff King
2016-06-28 17:26 ` [PATCH v2 0/2] Config " Nguyễn Thái Ngọc Duy
2016-06-28 17:26 ` [PATCH v2 1/2] add skip_prefix_mem helper Nguyễn Thái Ngọc Duy
2016-06-28 17:26 ` [PATCH v2 2/2] config: add conditional include Nguyễn Thái Ngọc Duy
2016-06-28 20:49 ` Jeff King
2016-06-29 4:06 ` Duy Nguyen
2016-06-28 23:11 ` Eric Sunshine
2016-07-12 16:42 ` [PATCH v3] " Nguyễn Thái Ngọc Duy
2016-07-13 7:21 ` Matthieu Moy
2016-07-13 7:26 ` Jeff King
2016-07-13 12:48 ` Matthieu Moy [this message]
2016-07-13 15:57 ` Duy Nguyen
2016-07-14 15:33 ` [PATCH v4] " Nguyễn Thái Ngọc Duy
2016-07-14 15:53 ` Johannes Schindelin
2016-07-14 16:13 ` Duy Nguyen
2016-07-16 13:30 ` Johannes Schindelin
2016-07-16 14:48 ` Duy Nguyen
2016-07-16 15:08 ` Jeff King
2016-07-16 16:36 ` Johannes Schindelin
2016-07-16 16:47 ` Jeff King
2016-07-17 8:15 ` Johannes Schindelin
2016-07-20 13:31 ` Jeff King
2016-07-20 22:07 ` Junio C Hamano
2016-07-20 16:39 ` Jakub Narębski
2016-08-13 8:40 ` Duy Nguyen
2016-08-19 13:54 ` Jeff King
2016-08-20 21:08 ` Jakub Narębski
2016-08-22 12:43 ` Duy Nguyen
2016-08-22 12:59 ` Matthieu Moy
2016-08-22 13:09 ` Duy Nguyen
2016-08-22 13:22 ` Matthieu Moy
2016-08-22 13:32 ` Duy Nguyen
2016-08-23 13:42 ` Johannes Schindelin
2016-08-24 9:37 ` Duy Nguyen
2016-08-24 12:44 ` Jakub Narębski
2016-08-24 14:17 ` Jeff King
2016-06-28 20:28 ` [PATCH v2 0/2] Config " Jeff King
2016-06-28 20:51 ` Matthieu Moy
2016-06-28 21:03 ` Jeff King
2016-06-29 4:09 ` Duy Nguyen
2016-06-28 22:11 ` 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=vpqmvllhff6.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sschuberth@gmail.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).