From: Olamide Caleb Bello <belkid98@gmail.com>
To: git@vger.kernel.org
Cc: toon@iotcl.com, phillip.wood123@gmail.com, gitster@pobox.com,
christian.couder@gmail.com, usmanakinyemi202@gmail.com,
kaartic.sivaraam@gmail.com, me@ttaylorr.com,
karthik.188@gmail.com, Olamide Caleb Bello <belkid98@gmail.com>
Subject: [Outreachy PATCH v7 0/3] store repo specific config values in new `struct repo_config_values`
Date: Mon, 16 Feb 2026 17:38:24 +0100 [thread overview]
Message-ID: <cover.1771258573.git.belkid98@gmail.com> (raw)
In-Reply-To: <cover.1769256839.git.belkid98@gmail.com>
Hi Git Community,
Over the course of my ongoing internship, which focused on moving repo specific
global variables in environment.h into local scope, I have attempted to move some
variables into the struct repo-settings.
However there has been some design concerns as regards the use of
`prepare_repo_settings()` with respect to when and where to call the
function, and also the change in behaviours when the variable is lazily
loaded as discussed in [1] and [2].
After different deliberations, Phillip Wood proposed creating a new config
struct [3], adding it to the repository struct and passing the repo struct to
`git_default_config()` to store parsed repo specific config values per repo.
This ensures the current behaviours will be retained.
In version v6, the fuzz-commit-graph failed due to the test being run
multiples times in the same process. This makes us get a BUG due to
the repository being reinitialized in the same process.
But now resetting the initialization using memset before rerunning
the test, the failure is not longer experienced.
1. https://lore.kernel.org/git/43aaec10-2696-44c9-8728-2045b83dc5d3@gmail.com/
2. https://lore.kernel.org/git/a881499d-e236-4f8e-a217-b6bce69e3e3c@gmail.com/
3. https://lore.kernel.org/git/8899016f-eeef-404b-8da6-ff3a90e81cea@gmail.com
4. https://github.com/git/git/actions/runs/21633462506/job/62352191148?pr=2166
5. https://gitlab.com/gitlab-community/gitlab-org/git/-/pipelines/2303203992
Changes in v7:
==============
- Added the code to reset the initialization of the_repository
in the fuzz-commit-graph test in Patch 1.
- Changed the call to rep_config_values_init() in
initialze_repository() by passing it the repo config_values_private_
struct instead of the accessor function in Patch 1.
- Modified the commit message in Patch 1
- Added extra lines between variable declarations and code
Olamide Caleb Bello (3):
environment: stop storing `core.attributesFile` globally
environment: stop using core.sparseCheckout globally
environment: move "branch.autoSetupMerge" into `struct
repo_config_values`
attr.c | 7 ++++---
branch.h | 2 --
builtin/backfill.c | 3 ++-
builtin/branch.c | 3 ++-
builtin/checkout.c | 3 ++-
builtin/clone.c | 4 +++-
builtin/grep.c | 2 +-
builtin/mv.c | 3 ++-
builtin/push.c | 3 ++-
builtin/sparse-checkout.c | 31 ++++++++++++++++++++-----------
builtin/submodule--helper.c | 3 ++-
builtin/worktree.c | 3 ++-
dir.c | 4 +++-
environment.c | 28 ++++++++++++++++++----------
environment.h | 17 +++++++++++++++--
oss-fuzz/fuzz-commit-graph.c | 1 +
repository.c | 14 ++++++++++++++
repository.h | 7 +++++++
sparse-index.c | 7 +++++--
unpack-trees.c | 3 ++-
wt-status.c | 4 +++-
21 files changed, 110 insertions(+), 42 deletions(-)
Range diff versus v6:
=====================
1: 7e3082125d ! 1: 48821a3848 environment: stop storing `core.attributesFile` globally
@@ Commit message
The `core.attributeFile` config value is parsed in
git_default_core_config(), loaded eagerly and stored in the global
- variable `git_attributes_file`. Storing this value in a global variable
- can lead to it being overwritten by another repository when more than one
- Git repository run in the same Git process.
+ variable `git_attributes_file`. Storing this value in a global
+ variable can lead to it being overwritten by another repository when
+ more than one Git repository run in the same Git process.
Create a new struct `repo_config_values` to hold this value and
other repository dependent values parsed by `git_default_config()`.
This will ensure the current behaviour remains the same while also
enabling the libification of Git.
- An accessor function 'repo_config_values()' is created and used to access
- the new struct member of the repository struct.
- This is to ensure that we detect if the struct repository has been
- initialized and also prevent double initialization of the repository.
-
- It is important to note that `git_default_config()` is a wrapper to other
- `git_default_*_config()` functions such as `git_default_core_config()`.
- Therefore to access and modify this global variable,
- the change has to be made `git_default_core_config()`.
+ An accessor function 'repo_config_values()' to ensure that we do not
+ access an uninitialized repository, or an instance of a different
+ repository than the current one.
Suggested-by: Phillip Wood <phillip.wood123@gmail.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
@@ environment.h: extern int assume_unchanged;
extern int pack_compression_level;
extern unsigned long pack_size_limit_cfg;
+ ## oss-fuzz/fuzz-commit-graph.c ##
+@@ oss-fuzz/fuzz-commit-graph.c: int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
+ {
+ struct commit_graph *g;
+
++ memset(the_repository, 0, sizeof(*the_repository));
+ initialize_repository(the_repository);
+
+ /*
+
## repository.c ##
@@ repository.c: static void set_default_hash_algo(struct repository *repo)
repo_set_hash_algo(repo, algo);
@@ repository.c: static void set_default_hash_algo(struct repository *repo)
+struct repo_config_values *repo_config_values(struct repository *repo)
+{
++ if (repo != the_repository)
++ BUG("trying to read config from wrong repository instance");
+ if(!repo->initialized)
+ BUG("config values from uninitialized repository");
+ return &repo->config_values_private_;
@@ repository.c: static void set_default_hash_algo(struct repository *repo)
ALLOC_ARRAY(repo->index, 1);
index_state_init(repo->index, repo);
repo->check_deprecated_config = true;
-+ repo_config_values_init(repo_config_values(repo));
++ repo_config_values_init(&repo->config_values_private_);
/*
* When a command runs inside a repository, it learns what
2: 8645b4f595 ! 2: 7d33f1ef0f environment: stop using core.sparseCheckout globally
@@ builtin/clone.c: static int git_sparse_checkout_init(const char *repo)
struct child_process cmd = CHILD_PROCESS_INIT;
int result = 0;
+ struct repo_config_values *cfg = repo_config_values(the_repository);
++
strvec_pushl(&cmd.args, "-C", repo, "sparse-checkout", "set", NULL);
/*
@@ dir.c: enum pattern_match_result path_matches_pattern_list(
{
- if (!core_apply_sparse_checkout)
+ struct repo_config_values *cfg = repo_config_values(the_repository);
++
+ if (!cfg->apply_sparse_checkout)
return 1;
if (istate->sparse_checkout_patterns)
@@ sparse-index.c: static int index_has_unmerged_entries(struct index_state *istate
{
- if (!core_apply_sparse_checkout || !core_sparse_checkout_cone)
+ struct repo_config_values *cfg = repo_config_values(the_repository);
++
+ if (!cfg->apply_sparse_checkout || !core_sparse_checkout_cone)
return 0;
3: 60451b93a5 = 3: c3ecfa63b9 environment: move "branch.autoSetupMerge" into `struct repo_config_values`
--
2.34.1
next prev parent reply other threads:[~2026-02-16 16:38 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-12 12:59 [Outreachy PATCH RFC 0/3] store git_default_config() parsed values in new config struct Olamide Caleb Bello
2026-01-12 12:59 ` [Outreachy PATCH RFC 1/3] environment: stop storing `core.attributesFile` globally Olamide Caleb Bello
2026-01-12 14:29 ` Phillip Wood
2026-01-12 15:05 ` Bello Olamide
2026-01-12 12:59 ` [Outreachy PATCH RFC 2/3] environment: stop using core.sparseCheckout globally Olamide Caleb Bello
2026-01-12 12:59 ` [Outreachy PATCH RFC 3/3] environment: move "branch.autoSetupMerge" into `struct config_values` Olamide Caleb Bello
2026-01-13 16:43 ` [Outreachy PATCH v2 0/3] store git_default_config() parsed values in new config struct Olamide Caleb Bello
2026-01-13 16:44 ` [Outreachy PATCH v2 1/3] environment: stop storing `core.attributesFile` globally Olamide Caleb Bello
2026-01-13 19:26 ` Junio C Hamano
2026-01-14 6:59 ` Bello Olamide
2026-01-13 16:44 ` [Outreachy PATCH v2 2/3] environment: environment: stop using core.sparseCheckout globally Olamide Caleb Bello
2026-01-13 19:38 ` Junio C Hamano
2026-01-14 7:16 ` Bello Olamide
2026-01-13 16:44 ` [Outreachy PATCH v2 3/3] environment: move "branch.autoSetupMerge" into `struct repo_config_values` Olamide Caleb Bello
2026-01-13 19:53 ` Junio C Hamano
2026-01-14 7:40 ` Bello Olamide
2026-01-15 22:17 ` [Outreachy PATCH v2 0/3] store git_default_config() parsed values in new config struct Bello Olamide
2026-01-17 20:59 ` [Outreachy PATCH v3 0/3] store repo specific config values in new `struct repo_config_values` Olamide Caleb Bello
2026-01-17 20:59 ` [Outreachy PATCH v3 1/3] environment: stop storing `core.attributesFile` globally Olamide Caleb Bello
2026-01-22 12:13 ` Toon Claes
2026-01-22 15:08 ` Bello Olamide
2026-01-22 14:40 ` Phillip Wood
2026-01-22 15:11 ` Bello Olamide
2026-01-17 20:59 ` [Outreachy PATCH v3 2/3] environment: environment: stop using core.sparseCheckout globally Olamide Caleb Bello
2026-01-22 12:13 ` Toon Claes
2026-01-22 15:17 ` Bello Olamide
2026-01-22 14:41 ` Phillip Wood
2026-01-22 15:29 ` Bello Olamide
2026-01-23 10:43 ` Phillip Wood
2026-01-23 13:24 ` Bello Olamide
2026-01-17 20:59 ` [Outreachy PATCH v3 3/3] environment: move "branch.autoSetupMerge" into `struct repo_config_values` Olamide Caleb Bello
2026-01-22 14:41 ` Phillip Wood
2026-01-22 15:29 ` Bello Olamide
2026-01-20 15:19 ` [Outreachy PATCH v3 0/3] store repo specific config values in new " Bello Olamide
2026-01-24 11:55 ` [Outreachy PATCH v4 " Olamide Caleb Bello
2026-01-24 11:55 ` [Outreachy PATCH v4 1/3] environment: stop storing `core.attributesFile` globally Olamide Caleb Bello
2026-01-24 11:55 ` [Outreachy PATCH v4 2/3] environment: stop using core.sparseCheckout globally Olamide Caleb Bello
2026-01-24 11:55 ` [Outreachy PATCH v4 3/3] environment: move "branch.autoSetupMerge" into `struct repo_config_values` Olamide Caleb Bello
2026-01-24 12:21 ` [Outreachy PATCH v5 0/3] store repo specific config values in new " Olamide Caleb Bello
2026-01-24 12:21 ` [Outreachy PATCH v5 1/3] environment: stop storing `core.attributesFile` globally Olamide Caleb Bello
2026-01-29 18:01 ` Junio C Hamano
2026-01-24 12:21 ` [Outreachy PATCH v5 2/3] environment: stop using core.sparseCheckout globally Olamide Caleb Bello
2026-01-29 18:12 ` Junio C Hamano
2026-01-24 12:21 ` [Outreachy PATCH v5 3/3] environment: move "branch.autoSetupMerge" into `struct repo_config_values` Olamide Caleb Bello
2026-01-29 18:37 ` Junio C Hamano
2026-01-30 16:20 ` Junio C Hamano
2026-01-30 20:15 ` Junio C Hamano
2026-01-29 8:29 ` [Outreachy PATCH v5 0/3] store repo specific config values in new " Bello Olamide
2026-02-03 15:42 ` [Outreachy PATCH v6 " Olamide Caleb Bello
2026-02-03 15:42 ` [Outreachy PATCH v6 1/3] environment: stop storing `core.attributesFile` globally Olamide Caleb Bello
2026-02-04 16:39 ` Phillip Wood
2026-02-09 8:47 ` Bello Olamide
2026-02-07 1:14 ` Junio C Hamano
2026-02-08 11:14 ` Phillip Wood
2026-02-09 8:54 ` Bello Olamide
2026-02-10 8:40 ` Bello Olamide
2026-02-03 15:42 ` [Outreachy PATCH v6 2/3] environment: stop using core.sparseCheckout globally Olamide Caleb Bello
2026-02-04 16:55 ` Phillip Wood
2026-02-03 15:42 ` [Outreachy PATCH v6 3/3] environment: move "branch.autoSetupMerge" into `struct repo_config_values` Olamide Caleb Bello
2026-02-04 16:57 ` [Outreachy PATCH v6 0/3] store repo specific config values in new " Phillip Wood
2026-02-16 16:38 ` Olamide Caleb Bello [this message]
2026-02-16 16:38 ` [Outreachy PATCH v7 1/3] environment: stop storing `core.attributesFile` globally Olamide Caleb Bello
2026-02-16 16:38 ` [Outreachy PATCH v7 2/3] environment: stop using core.sparseCheckout globally Olamide Caleb Bello
2026-02-26 12:57 ` Christian Couder
2026-02-26 15:23 ` Junio C Hamano
2026-02-26 16:24 ` Bello Olamide
2026-02-16 16:38 ` [Outreachy PATCH v7 3/3] environment: move "branch.autoSetupMerge" into `struct repo_config_values` Olamide Caleb Bello
2026-02-17 20:08 ` [Outreachy PATCH v7 0/3] store repo specific config values in new " Junio C Hamano
2026-02-18 11:27 ` Bello Olamide
2026-02-26 13:03 ` Christian Couder
2026-02-26 15:19 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1771258573.git.belkid98@gmail.com \
--to=belkid98@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=karthik.188@gmail.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood123@gmail.com \
--cc=toon@iotcl.com \
--cc=usmanakinyemi202@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