From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
sschuberth@gmail.com, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Philip Oakley <philipoakley@iee.org>
Subject: Re: [PATCH v7 3/3] config: add conditional include
Date: Wed, 1 Mar 2017 17:16:28 +0000 [thread overview]
Message-ID: <32efbc7b-182e-2169-78a7-c959661f8207@ramsayjones.plus.com> (raw)
In-Reply-To: <20170301112631.16497-4-pclouds@gmail.com>
On 01/03/17 11:26, Nguyễn Thái Ngọc Duy wrote:
> Sometimes a set of repositories want to share configuration settings
> among themselves that are distinct from other such sets of repositories.
> A user may work on two projects, each of which have multiple
> repositories, and use one user.email for one project while using another
> for the other.
>
> Setting $GIT_DIR/.config works, but if the penalty of forgetting to
> update $GIT_DIR/.config is high (especially when you end up cloning
> often), it may not be the best way to go. Having the settings in
> ~/.gitconfig, which would work for just one set of repositories, would
> not well in such a situation. Having separate ${HOME}s may add more
> problems than it solves.
>
> Extend the include.path mechanism that lets a config file include
> another config file, so that the inclusion can be done only when some
> conditions hold. Then ~/.gitconfig can say "include config-project-A
> only when working on project-A" for each project A the user works on.
>
> In this patch, the only supported grouping is based on $GIT_DIR (in
> absolute path), so you would need to group repositories by directory, or
> something like that to take advantage of it.
>
> We already have include.path for unconditional includes. This patch goes
> with includeIf.<condition>.path to make it clearer that a condition is
> required. The new config has the same backward compatibility approach as
> include.path: older git versions that don't understand includeIf will
> simply ignore them.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> Documentation/config.txt | 64 +++++++++++++++++++++++++++++++++
> config.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++
> t/t1305-config-include.sh | 56 +++++++++++++++++++++++++++++
> 3 files changed, 212 insertions(+)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 1fad746efd..2a41e84bab 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -90,6 +90,59 @@ found at the location of the include directive. If the value of the
> be relative to the configuration file in which the include directive
> was found. See below for examples.
>
> +Conditional includes
> +~~~~~~~~~~~~~~~~~~~~
> +
> +You can include a config file from another conditionally by setting a
> +`includeIf.<condition>.path` variable to the name of the file to be
> +included. The variable's value is treated the same way as
> +`include.path`. `includeIf.<condition>path` supports multiple key
----------------------------------------^^
s/<condition>path/<condition>.path/
ATB,
Ramsay Jones
next prev parent reply other threads:[~2017-03-01 17:16 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 12:23 [PATCH v5 0/1] Conditional config include Nguyễn Thái Ngọc Duy
2017-02-23 12:23 ` [PATCH v5 1/1] config: add conditional include Nguyễn Thái Ngọc Duy
2017-02-23 19:59 ` Junio C Hamano
2017-02-24 9:37 ` Duy Nguyen
2017-02-24 17:46 ` Junio C Hamano
2017-02-26 6:07 ` Jeff King
2017-02-27 18:42 ` Junio C Hamano
2017-03-06 22:44 ` Stefan Beller
2017-03-07 8:47 ` Jeff King
2017-03-07 18:39 ` Stefan Beller
2017-02-24 13:14 ` [PATCH v6 0/1] Conditional config include Nguyễn Thái Ngọc Duy
2017-02-24 13:14 ` [PATCH v6 1/1] config: add conditional include Nguyễn Thái Ngọc Duy
2017-02-24 18:35 ` Junio C Hamano
2017-02-24 19:48 ` Ramsay Jones
2017-02-24 22:08 ` Philip Oakley
2017-02-26 3:02 ` Duy Nguyen
2017-02-26 12:27 ` Philip Oakley
2017-02-24 13:14 ` [PATCH v6 0/1] Conditional config include Nguyễn Thái Ngọc Duy
2017-02-24 13:18 ` Duy Nguyen
2017-02-24 13:14 ` [PATCH v6 1/1] config: add conditional include Nguyễn Thái Ngọc Duy
2017-02-26 6:12 ` Jeff King
2017-03-01 11:26 ` [PATCH v7 0/3] Conditional config include Nguyễn Thái Ngọc Duy
2017-03-01 11:26 ` [PATCH v7 1/3] config.txt: clarify multiple key values in include.path Nguyễn Thái Ngọc Duy
2017-03-01 17:40 ` Junio C Hamano
2017-03-01 11:26 ` [PATCH v7 2/3] config.txt: reflow the second include.path paragraph Nguyễn Thái Ngọc Duy
2017-03-01 11:26 ` [PATCH v7 3/3] config: add conditional include Nguyễn Thái Ngọc Duy
2017-03-01 17:16 ` Ramsay Jones [this message]
2017-03-01 17:47 ` Junio C Hamano
2017-03-03 6:30 ` Jeff King
2017-03-03 19:05 ` Junio C Hamano
2017-03-03 22:24 ` Jeff King
2017-03-01 17:52 ` [PATCH v7 0/3] Conditional config include Junio C Hamano
2017-03-03 6:33 ` Jeff King
2017-03-03 9:52 ` Duy Nguyen
2017-03-03 19:13 ` Junio C Hamano
2017-03-03 21:08 ` Junio C Hamano
2017-03-03 18:24 ` Junio C Hamano
2017-03-03 22:22 ` Jeff King
2017-03-03 23:22 ` 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=32efbc7b-182e-2169-78a7-c959661f8207@ramsayjones.plus.com \
--to=ramsay@ramsayjones.plus.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--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).