Re: [RFC PATCH v2 1/4] config: rename "submodule" scope to "gitmodules"
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Apr 23, 2021, 09:46 UTC
- Message-ID
- <8d27af1f-7fa3-e3a7-f042-2559fc24bc18@gmail.com>
- In-Reply-To
- <20210423001539.4059524-2-emilyshaffer@google.com>
Hi Emily
On 23/04/2021 01:15, Emily Shaffer wrote:
> To prepare for the addition of a new config scope which only applies to > submodule projects, disambiguate "CONFIG_SCOPE_SUBMODULES". This scope > refers to configs gathered from the .gitmodules file in the > superproject, so just call it "gitmodules."
Am I right in thinking that this changes the output of `git config --show-scope`? If so I'm not sure it's a good idea as it would break any scripts that are parsing that output
Best Wishes
Phillip
Show 49 quoted lines
> Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
> ---
> config.c | 4 ++--
> config.h | 2 +-
> submodule-config.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/config.c b/config.c
> index 870d9534de..c8426ef3f3 100644
> --- a/config.c
> +++ b/config.c
> @@ -3499,8 +3499,8 @@ const char *config_scope_name(enum config_scope scope)
> return "worktree";
> case CONFIG_SCOPE_COMMAND:
> return "command";
> - case CONFIG_SCOPE_SUBMODULE:
> - return "submodule";
> + case CONFIG_SCOPE_GITMODULES:
> + return "gitmodules";
> default:
> return "unknown";
> }
> diff --git a/config.h b/config.h
> index 19a9adbaa9..535f5517b8 100644
> --- a/config.h
> +++ b/config.h
> @@ -42,7 +42,7 @@ enum config_scope {
> CONFIG_SCOPE_LOCAL,
> CONFIG_SCOPE_WORKTREE,
> CONFIG_SCOPE_COMMAND,
> - CONFIG_SCOPE_SUBMODULE,
> + CONFIG_SCOPE_GITMODULES,
> };
> const char *config_scope_name(enum config_scope scope);
>
> diff --git a/submodule-config.c b/submodule-config.c
> index f502505566..0e435e6fdd 100644
> --- a/submodule-config.c
> +++ b/submodule-config.c
> @@ -637,7 +637,7 @@ static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void
> {
> if (repo->worktree) {
> struct git_config_source config_source = {
> - 0, .scope = CONFIG_SCOPE_SUBMODULE
> + 0, .scope = CONFIG_SCOPE_GITMODULES
> };
> const struct config_options opts = { 0 };
> struct object_id oid;
>