From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: randall.becker@nexbridge.ca
Cc: git@vger.kernel.org, "Randall S. Becker" <rsbecker@nexbridge.com>
Subject: Re: [Patch 1/3] config.c: add conditional include based on worktree.
Date: Tue, 13 Jul 2021 15:03:21 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2107131502360.76@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20210712223139.24409-2-randall.becker@nexbridge.ca>
Hi Randall,
On Mon, 12 Jul 2021, randall.becker@nexbridge.ca wrote:
> @@ -300,6 +358,11 @@ static int include_condition_is_true(const struct config_options *opts,
> return include_by_gitdir(opts, cond, cond_len, 0);
> else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len))
> return include_by_gitdir(opts, cond, cond_len, 1);
> + else if (skip_prefix_mem(cond, cond_len, "worktree:", &cond, &cond_len))
> + return include_by_worktree(opts, cond, cond_len, 0);
> + else if (skip_prefix_mem(cond, cond_len, "worktree/i:", &cond,
> + &cond_len))
> + return include_by_worktree(opts, cond, cond_len, 1);
Thank you for not forgetting the `/i` case.
Ciao,
Dscho
> else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
> return include_by_branch(cond, cond_len);
>
> --
> 2.32.0
>
>
next prev parent reply other threads:[~2021-07-13 13:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-12 22:31 [Patch 0/3] includeIf series for worktrees randall.becker
2021-07-12 22:31 ` [Patch 1/3] config.c: add conditional include based on worktree randall.becker
2021-07-13 13:03 ` Johannes Schindelin [this message]
2021-07-12 22:31 ` [Patch 2/3] Documentation/config.txt: add worktree includeIf conditionals randall.becker
2021-07-14 1:04 ` Junio C Hamano
2021-07-14 13:46 ` Randall S. Becker
2021-07-14 17:10 ` Junio C Hamano
2021-07-14 17:30 ` Randall S. Becker
2021-07-12 22:31 ` [Patch 3/3] t1305: add tests for includeIf:worktree randall.becker
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2107131502360.76@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=randall.becker@nexbridge.ca \
--cc=rsbecker@nexbridge.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.
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 NNTP newsgroup(s).