From: Elijah Newren <newren@gmail.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: Git Mailing List <git@vger.kernel.org>, Glen Choo <chooglen@google.com>
Subject: Re: [PATCH v8 0/2] Conditional config includes based on remote URL
Date: Tue, 18 Jan 2022 12:54:40 -0800 [thread overview]
Message-ID: <CABPp-BE+CCqZxSZnhn7drqYsA9XhqGaE++kPwRiAtbm4pvSFVA@mail.gmail.com> (raw)
In-Reply-To: <cover.1642527965.git.jonathantanmy@google.com>
On Tue, Jan 18, 2022 at 9:47 AM Jonathan Tan <jonathantanmy@google.com> wrote:
>
> Thanks everyone for your review. v8 follows Elijah Newren's comments
> about making URLs more identifiable in tests, and also including an
> example in documentation.
Thanks for that; this version looks good to me.
> Jonathan Tan (2):
> config: make git_config_include() static
> config: include file if remote URL matches a glob
>
> Documentation/config.txt | 35 +++++++++++
> config.c | 132 ++++++++++++++++++++++++++++++++++++---
> config.h | 46 ++++----------
> t/t1300-config.sh | 118 ++++++++++++++++++++++++++++++++++
> 4 files changed, 290 insertions(+), 41 deletions(-)
>
> Range-diff against v7:
> 1: b2dcae03ed = 1: b2dcae03ed config: make git_config_include() static
> 2: 7c70089074 ! 2: 6691e39c82 config: include file if remote URL matches a glob
> @@ Documentation/config.txt: all branches that begin with `foo/`. This is useful if
> A few more notes on matching via `gitdir` and `gitdir/i`:
>
> * Symlinks in `$GIT_DIR` are not resolved before matching.
> +@@ Documentation/config.txt: Example
> + ; currently checked out
> + [includeIf "onbranch:foo-branch"]
> + path = foo.inc
> ++
> ++; include only if a remote with the given URL exists (note
> ++; that such a URL may be provided later in a file or in a
> ++; file read after this file is read, as seen in this example)
> ++[includeIf "hasconfig:remote.*.url:https://example.com/**"]
> ++ path = foo.inc
> ++[remote "origin"]
> ++ url = https://example.com/git
> + ----
> +
> + Values
>
> ## config.c ##
> @@ config.c: struct config_include_data {
> @@ t/t1300-config.sh: test_expect_success '--get and --get-all with --fixed-value'
> + that = that-is-not-included
> + EOF
> + cat >>hasremoteurlTest/.git/config <<-EOF &&
> -+ [includeIf "hasconfig:remote.*.url:foo"]
> ++ [includeIf "hasconfig:remote.*.url:foourl"]
> + path = "$(pwd)/include-this"
> -+ [includeIf "hasconfig:remote.*.url:bar"]
> ++ [includeIf "hasconfig:remote.*.url:barurl"]
> + path = "$(pwd)/dont-include-that"
> + [remote "foo"]
> -+ url = foo
> ++ url = foourl
> + EOF
> +
> + echo this-is-included >expect-this &&
> @@ t/t1300-config.sh: test_expect_success '--get and --get-all with --fixed-value'
> + EOF
> + cat >>hasremoteurlTest/.git/config <<-EOF &&
> + [remote "foo"]
> -+ url = foo
> ++ url = foourl
> + [user]
> + one = main-config
> + two = main-config
> -+ [includeIf "hasconfig:remote.*.url:foo"]
> ++ [includeIf "hasconfig:remote.*.url:foourl"]
> + path = "$(pwd)/include-two-three"
> + [user]
> + three = main-config
> @@ t/t1300-config.sh: test_expect_success '--get and --get-all with --fixed-value'
> +
> + cat >include-with-url <<-\EOF &&
> + [remote "bar"]
> -+ url = bar
> ++ url = barurl
> + EOF
> + cat >>hasremoteurlTest/.git/config <<-EOF &&
> -+ [includeIf "hasconfig:remote.*.url:foo"]
> ++ [includeIf "hasconfig:remote.*.url:foourl"]
> + path = "$(pwd)/include-with-url"
> + EOF
> +
> --
> 2.34.1.703.g22d0c6ccf7-goog
>
prev parent reply other threads:[~2022-01-18 20:55 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-12 22:57 [RFC PATCH 0/2] Conditional config includes based on remote URL Jonathan Tan
2021-10-12 22:57 ` [RFC PATCH 1/2] config: make git_config_include() static Jonathan Tan
2021-10-12 23:07 ` Jeff King
2021-10-12 23:26 ` Junio C Hamano
2021-10-13 8:26 ` Ævar Arnfjörð Bjarmason
2021-10-13 17:00 ` Junio C Hamano
2021-10-13 18:13 ` Jonathan Tan
2021-10-12 22:57 ` [RFC PATCH 2/2] config: include file if remote URL matches a glob Jonathan Tan
2021-10-12 23:30 ` Jeff King
2021-10-13 18:33 ` Jonathan Tan
2021-10-27 11:40 ` Jeff King
2021-10-27 17:23 ` Jonathan Tan
2021-10-12 23:48 ` Junio C Hamano
2021-10-13 19:52 ` Jonathan Tan
2021-10-13 0:46 ` [RFC PATCH 0/2] Conditional config includes based on remote URL brian m. carlson
2021-10-13 18:17 ` Jonathan Tan
2021-10-18 20:48 ` Jonathan Tan
2021-10-22 3:12 ` Emily Shaffer
2021-10-27 11:55 ` Jeff King
2021-10-27 17:52 ` Jonathan Tan
2021-10-27 20:32 ` Jeff King
2021-10-25 13:03 ` Ævar Arnfjörð Bjarmason
2021-10-25 18:53 ` Jonathan Tan
2021-10-26 10:12 ` Ævar Arnfjörð Bjarmason
2021-10-29 17:31 ` [WIP v2 " Jonathan Tan
2021-10-29 17:31 ` [WIP v2 1/2] config: make git_config_include() static Jonathan Tan
2021-11-05 19:45 ` Emily Shaffer
2021-10-29 17:31 ` [WIP v2 2/2] config: include file if remote URL matches a glob Jonathan Tan
2021-11-05 20:24 ` Emily Shaffer
2021-11-06 4:41 ` Ævar Arnfjörð Bjarmason
2021-11-09 0:25 ` Jonathan Tan
2021-11-09 0:22 ` Jonathan Tan
2021-11-16 0:00 ` [PATCH v3 0/2] Conditional config includes based on remote URL Jonathan Tan
2021-11-16 0:00 ` [PATCH v3 1/2] config: make git_config_include() static Jonathan Tan
2021-11-16 0:00 ` [PATCH v3 2/2] config: include file if remote URL matches a glob Jonathan Tan
2021-11-22 22:59 ` Glen Choo
2021-11-29 17:53 ` Jonathan Tan
2021-11-23 1:22 ` Junio C Hamano
2021-11-29 18:18 ` Jonathan Tan
2021-12-01 18:51 ` Junio C Hamano
2021-12-02 23:14 ` Jonathan Tan
2021-11-23 1:27 ` Ævar Arnfjörð Bjarmason
2021-11-29 18:33 ` Jonathan Tan
2021-11-29 20:50 ` Ævar Arnfjörð Bjarmason
2021-11-29 20:23 ` [PATCH v4 0/2] Conditional config includes based on remote URL Jonathan Tan
2021-11-29 20:23 ` [PATCH v4 1/2] config: make git_config_include() static Jonathan Tan
2021-11-29 20:23 ` [PATCH v4 2/2] config: include file if remote URL matches a glob Jonathan Tan
2021-12-02 6:57 ` Junio C Hamano
2021-12-02 17:41 ` Jonathan Tan
2021-11-29 20:48 ` [PATCH v4 0/2] Conditional config includes based on remote URL Ævar Arnfjörð Bjarmason
2021-11-30 7:51 ` Junio C Hamano
2021-12-02 23:31 ` [PATCH v5 " Jonathan Tan
2021-12-02 23:31 ` [PATCH v5 1/2] config: make git_config_include() static Jonathan Tan
2021-12-02 23:31 ` [PATCH v5 2/2] config: include file if remote URL matches a glob Jonathan Tan
2021-12-06 22:32 ` Glen Choo
2021-12-07 17:53 ` Jonathan Tan
2021-12-06 18:57 ` [PATCH v5 0/2] Conditional config includes based on remote URL Ævar Arnfjörð Bjarmason
2021-12-07 17:46 ` Jonathan Tan
2021-12-07 17:56 ` Ævar Arnfjörð Bjarmason
2021-12-07 18:52 ` Jonathan Tan
2021-12-07 23:23 ` [PATCH v6 " Jonathan Tan
2021-12-07 23:23 ` [PATCH v6 1/2] config: make git_config_include() static Jonathan Tan
2021-12-07 23:23 ` [PATCH v6 2/2] config: include file if remote URL matches a glob Jonathan Tan
2021-12-08 19:19 ` Glen Choo
2021-12-09 22:16 ` Jonathan Tan
2021-12-08 19:55 ` Glen Choo
2021-12-09 22:39 ` Jonathan Tan
2021-12-09 23:33 ` Glen Choo
2021-12-13 23:35 ` Jonathan Tan
2021-12-10 21:45 ` Junio C Hamano
2021-12-13 23:37 ` Jonathan Tan
2021-12-14 21:31 ` [PATCH v7 0/2] Conditional config includes based on remote URL Jonathan Tan
2021-12-14 21:31 ` [PATCH v7 1/2] config: make git_config_include() static Jonathan Tan
2021-12-14 21:31 ` [PATCH v7 2/2] config: include file if remote URL matches a glob Jonathan Tan
2021-12-16 21:54 ` Glen Choo
2021-12-28 0:55 ` Elijah Newren
2022-01-10 18:58 ` Jonathan Tan
2021-12-16 21:57 ` [PATCH v7 0/2] Conditional config includes based on remote URL Glen Choo
2021-12-28 1:13 ` Elijah Newren
2021-12-28 23:13 ` Glen Choo
2022-01-10 19:22 ` Jonathan Tan
2022-01-10 20:17 ` Elijah Newren
2022-01-25 13:26 ` Scalar vs JGit, was " Johannes Schindelin
2022-01-18 17:47 ` [PATCH v8 " Jonathan Tan
2022-01-18 17:47 ` [PATCH v8 1/2] config: make git_config_include() static Jonathan Tan
2022-01-18 17:47 ` [PATCH v8 2/2] config: include file if remote URL matches a glob Jonathan Tan
2022-01-18 20:54 ` Elijah Newren [this message]
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=CABPp-BE+CCqZxSZnhn7drqYsA9XhqGaE++kPwRiAtbm4pvSFVA@mail.gmail.com \
--to=newren@gmail.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.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).