From: Usman Akinyemi <usmanakinyemi202@gmail.com>
To: git@vger.kernel.org, christian.couder@gmail.com
Cc: gitster@pobox.com, johncai86@gmail.com, me@ttaylorr.com,
phillip.wood123@gmail.com, ps@pks.im, shejialuo@gmail.com,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 1/9] config: teach repo_config to allow `repo` to be NULL
Date: Tue, 18 Mar 2025 17:28:53 +0530 [thread overview]
Message-ID: <20250318115912.2978992-2-usmanakinyemi202@gmail.com> (raw)
In-Reply-To: <20250318115912.2978992-1-usmanakinyemi202@gmail.com>
The `repo` value can be NULL if a builtin command is run outside
any repository. The current implementation of `repo_config()` will
fail if `repo` is NULL.
If the `repo` is NULL the `repo_config()` can ignore the repository
configuration but it should read the other configuration sources like
the system-side configuration instead of failing.
Teach the `repo_config()` to allow `repo` to be NULL by calling the
`read_very_early_config()` which read config but only enumerate system
and global settings.
This will be useful in the following commits.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com>
---
config.c | 4 ++++
config.h | 9 +++++++++
2 files changed, 13 insertions(+)
diff --git a/config.c b/config.c
index 658569af08..e127afaa8f 100644
--- a/config.c
+++ b/config.c
@@ -2521,6 +2521,10 @@ void repo_config_clear(struct repository *repo)
void repo_config(struct repository *repo, config_fn_t fn, void *data)
{
+ if (!repo) {
+ read_very_early_config(fn, data);
+ return;
+ }
git_config_check_init(repo);
configset_iter(repo->config, fn, data);
}
diff --git a/config.h b/config.h
index 5c730c4f89..29a0277483 100644
--- a/config.h
+++ b/config.h
@@ -219,6 +219,15 @@ void read_very_early_config(config_fn_t cb, void *data);
* repo-specific one; by overwriting, the higher-priority repo-specific
* value is left at the end).
*
+ * In cases where the repository variable is NULL, repo_config() will
+ * skip the per-repository config but retain system and global configs
+ * by calling read_very_early_config() which also ignores one-time
+ * overrides like "git -c var=val". This is to support handling "git foo -h"
+ * (which lets git.c:run_builtin() to pass NULL and have the cmd_foo()
+ * call repo_config() before calling parse_options() to notice "-h", give
+ * help and exit) for a command that ordinarily require a repository
+ * so this limitation may be OK (but if needed you are welcome to fix it).
+ *
* Unlike git_config_from_file(), this function respects includes.
*/
void repo_config(struct repository *r, config_fn_t fn, void *);
--
2.48.1
next prev parent reply other threads:[~2025-03-18 11:59 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-18 11:58 [PATCH 0/9] remove unnecessary if statement Usman Akinyemi
2025-03-18 11:58 ` Usman Akinyemi [this message]
2025-03-20 7:21 ` [PATCH 1/9] config: teach repo_config to allow `repo` to be NULL Patrick Steinhardt
2025-03-21 6:56 ` Usman Akinyemi
2025-03-18 11:58 ` [PATCH 2/9] builtin/verify-tag: stop using `the_repository` Usman Akinyemi
2025-03-20 7:21 ` Patrick Steinhardt
2025-03-18 11:58 ` [PATCH 3/9] builtin/verify-commit: " Usman Akinyemi
2025-03-18 11:58 ` [PATCH 4/9] builtin/send-pack: " Usman Akinyemi
2025-03-18 11:58 ` [PATCH 5/9] builtin/pack-refs: " Usman Akinyemi
2025-03-18 11:58 ` [PATCH 6/9] builtin/ls-files: " Usman Akinyemi
2025-03-18 11:58 ` [PATCH 7/9] builtin/for-each-ref: " Usman Akinyemi
2025-03-18 11:59 ` [PATCH 8/9] builtin/checkout-index: " Usman Akinyemi
2025-03-18 11:59 ` [PATCH 9/9] builtin/update-server-info: remove unnecessary if statement Usman Akinyemi
2025-03-20 7:21 ` Patrick Steinhardt
2025-03-21 7:00 ` Usman Akinyemi
2025-03-18 20:21 ` [PATCH 0/9] " Junio C Hamano
2025-03-19 3:53 ` Usman Akinyemi
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=20250318115912.2978992-2-usmanakinyemi202@gmail.com \
--to=usmanakinyemi202@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johncai86@gmail.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood123@gmail.com \
--cc=ps@pks.im \
--cc=shejialuo@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.
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).