From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>,
chooglen@google.com, avarab@gmail.com
Subject: [PATCH v6 0/2] Conditional config includes based on remote URL
Date: Tue, 7 Dec 2021 15:23:50 -0800 [thread overview]
Message-ID: <cover.1638919346.git.jonathantanmy@google.com> (raw)
In-Reply-To: <cover.1634077795.git.jonathantanmy@google.com>
Here's a reroll addressing Ævar's comments about needless $(pwd) and
separating out include_by_remote_url() to make things more consistent.
Jonathan Tan (2):
config: make git_config_include() static
config: include file if remote URL matches a glob
Documentation/config.txt | 16 +++++
config.c | 133 ++++++++++++++++++++++++++++++++++++---
config.h | 46 ++++----------
t/t1300-config.sh | 118 ++++++++++++++++++++++++++++++++++
4 files changed, 272 insertions(+), 41 deletions(-)
Range-diff against v5:
1: b2dcae03ed = 1: b2dcae03ed config: make git_config_include() static
2: d3b8e00717 ! 2: de2be06818 config: include file if remote URL matches a glob
@@ config.c: static int include_by_branch(const char *cond, size_t cond_len)
+ return found;
+}
+
++static int include_by_remote_url(struct config_include_data *inc,
++ const char *cond, size_t cond_len)
++{
++ if (inc->opts->unconditional_remote_url)
++ return 1;
++ if (!inc->remote_urls)
++ populate_remote_urls(inc);
++ return at_least_one_url_matches_glob(cond, cond_len,
++ inc->remote_urls);
++}
++
+static int include_condition_is_true(struct config_include_data *inc,
const char *cond, size_t cond_len)
{
+ const struct config_options *opts = inc->opts;
-- if (skip_prefix_mem(cond, cond_len, "gitdir:", &cond, &cond_len))
-+ if (skip_prefix_mem(cond, cond_len, "gitdir:", &cond, &cond_len)) {
+ if (skip_prefix_mem(cond, cond_len, "gitdir:", &cond, &cond_len))
return include_by_gitdir(opts, cond, cond_len, 0);
-- else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len))
-+ } else if (skip_prefix_mem(cond, cond_len, "gitdir/i:", &cond, &cond_len)) {
+@@ config.c: static int include_condition_is_true(const struct config_options *opts,
return include_by_gitdir(opts, cond, cond_len, 1);
-- else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
-+ } else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len)) {
+ else if (skip_prefix_mem(cond, cond_len, "onbranch:", &cond, &cond_len))
return include_by_branch(cond, cond_len);
-+ } else if (skip_prefix_mem(cond, cond_len, "hasconfig:remote.*.url:", &cond,
-+ &cond_len)) {
-+ if (inc->opts->unconditional_remote_url)
-+ return 1;
-+ if (!inc->remote_urls)
-+ populate_remote_urls(inc);
-+ return at_least_one_url_matches_glob(cond, cond_len,
-+ inc->remote_urls);
-+ }
++ else if (skip_prefix_mem(cond, cond_len, "hasconfig:remote.*.url:", &cond,
++ &cond_len))
++ return include_by_remote_url(inc, cond, cond_len);
/* unknown conditionals are always false */
return 0;
@@ t/t1300-config.sh: test_expect_success '--get and --get-all with --fixed-value'
+ git init hasremoteurlTest &&
+ test_when_finished "rm -rf hasremoteurlTest" &&
+
-+ cat >"$(pwd)"/include-this <<-\EOF &&
++ cat >include-this <<-\EOF &&
+ [user]
+ this = this-is-included
+ EOF
-+ cat >"$(pwd)"/dont-include-that <<-\EOF &&
++ cat >dont-include-that <<-\EOF &&
+ [user]
+ that = that-is-not-included
+ EOF
@@ t/t1300-config.sh: test_expect_success '--get and --get-all with --fixed-value'
+ git init hasremoteurlTest &&
+ test_when_finished "rm -rf hasremoteurlTest" &&
+
-+ cat >"$(pwd)"/include-two-three <<-\EOF &&
++ cat >include-two-three <<-\EOF &&
+ [user]
+ two = included-config
+ three = included-config
@@ t/t1300-config.sh: test_expect_success '--get and --get-all with --fixed-value'
+ git init hasremoteurlTest &&
+ test_when_finished "rm -rf hasremoteurlTest" &&
+
-+ printf "[user]\ndss = yes\n" >"$(pwd)/double-star-start" &&
-+ printf "[user]\ndse = yes\n" >"$(pwd)/double-star-end" &&
-+ printf "[user]\ndsm = yes\n" >"$(pwd)/double-star-middle" &&
-+ printf "[user]\nssm = yes\n" >"$(pwd)/single-star-middle" &&
-+ printf "[user]\nno = no\n" >"$(pwd)/no" &&
++ printf "[user]\ndss = yes\n" >double-star-start &&
++ printf "[user]\ndse = yes\n" >double-star-end &&
++ printf "[user]\ndsm = yes\n" >double-star-middle &&
++ printf "[user]\nssm = yes\n" >single-star-middle &&
++ printf "[user]\nno = no\n" >no &&
+
+ cat >>hasremoteurlTest/.git/config <<-EOF &&
+ [remote "foo"]
@@ t/t1300-config.sh: test_expect_success '--get and --get-all with --fixed-value'
+ git init hasremoteurlTest &&
+ test_when_finished "rm -rf hasremoteurlTest" &&
+
-+ cat >"$(pwd)"/include-with-url <<-\EOF &&
++ cat >include-with-url <<-\EOF &&
+ [remote "bar"]
+ url = bar
+ EOF
--
2.34.1.400.ga245620fadb-goog
next prev parent reply other threads:[~2021-12-07 23:23 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 ` Jonathan Tan [this message]
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 ` [PATCH v8 0/2] Conditional config includes based on remote URL Elijah Newren
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=cover.1638919346.git.jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=avarab@gmail.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
/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).