config: preserve scope in do_git_config_sequence

do_git_config_sequence operated under the assumption that it was correct to set current_parsing_scope to CONFIG_SCOPE_UNKNOWN as part of the cleanup it does after it finishes execution. This is incorrect, as it blows away the current_parsing_scope if do_git_config_sequence is called recursively. As such situations are rare (git config running with the '--blob' option is one example) this has yet to cause a problem, but the upcoming '--show-scope' option will experience issues in that case, lets teach do_git_config_sequence to preserve the current_parsing_scope from before it started execution. Signed-off-by: Matthew Rogers <mattr94@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Matthew Rogers committed Feb 10, 2020 at 00:30 UTC 5c105a842eae59a3271f5db861ef8d85de6bc2f8

1 file changed +2 -1

config.c

+2 -1

@@ -1702,6 +1702,7 @@ static int do_git_config_sequence(const struct config_options *opts,

1702 char *xdg_config = xdg_config_home("config");

1703 char *user_config = expand_user_path("~/.gitconfig", 0);

1704 char *repo_config;

1705 + enum config_scope prev_parsing_scope = current_parsing_scope;

1706

1707 if (opts->commondir)

1708 repo_config = mkpathdup("%s/config", opts->commondir);

@@ -1741,7 +1742,7 @@ static int do_git_config_sequence(const struct config_options *opts,

1742 if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0)

1743 die(_("unable to parse command-line config"));

1744

1744 - current_parsing_scope = CONFIG_SCOPE_UNKNOWN;

1745 + current_parsing_scope = prev_parsing_scope;

1746 free(xdg_config);

1747 free(user_config);

1748 free(repo_config);