diff options
author | Victoria Dye <vdye@github.com> | 2023-05-26 01:33:00 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-05-26 13:53:41 +0900 |
commit | 3867f6d650c89230ae7393e2d57160ccc14758c7 (patch) | |
tree | 967a2971733b17b584c01943116e39264203f38a /repository.h | |
parent | 9b6b06c159e0a389aaafbce91dd85bb5244ac5ad (diff) | |
download | git-3867f6d650c89230ae7393e2d57160ccc14758c7.tar.gz |
repository: move 'repository_format_worktree_config' to repo scope
Move 'repository_format_worktree_config' out of the global scope and into
the 'repository' struct. This change is similar to how
'repository_format_partial_clone' was moved in ebaf3bcf1ae (repository: move
global r_f_p_c to repo struct, 2021-06-17), adding it to the 'repository'
struct and updating 'setup.c' & 'repository.c' functions to assign the value
appropriately.
The primary goal of this change is to be able to load the worktree config of
a submodule depending on whether that submodule - not its superproject - has
'extensions.worktreeConfig' enabled. To ensure 'do_git_config_sequence()'
has access to the newly repo-scoped configuration, add a 'struct repository'
argument to 'do_git_config_sequence()' and pass it the 'repo' value from
'config_with_options()'.
Finally, add/update tests in 't3007-ls-files-recurse-submodules.sh' to
verify 'extensions.worktreeConfig' is read an used independently by
superprojects and submodules.
Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'repository.h')
-rw-r--r-- | repository.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/repository.h b/repository.h index 1a13ff2867..74ae26635a 100644 --- a/repository.h +++ b/repository.h @@ -163,6 +163,7 @@ struct repository { struct promisor_remote_config *promisor_remote_config; /* Configurations */ + int repository_format_worktree_config; /* Indicate if a repository has a different 'commondir' from 'gitdir' */ unsigned different_commondir:1; |