summaryrefslogtreecommitdiff
path: root/builtin/config.c
diff options
context:
space:
mode:
authorMatthew Rogers <mattr94@gmail.com>2020-02-10 00:30:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-10 18:39:04 (GMT)
commit5c105a842eae59a3271f5db861ef8d85de6bc2f8 (patch)
tree80f29a121040d1335abbe7b71fc3dd4785443046 /builtin/config.c
parent6766e41b8aae21927625adbb8cdc87804153639a (diff)
downloadgit-5c105a842eae59a3271f5db861ef8d85de6bc2f8.zip
git-5c105a842eae59a3271f5db861ef8d85de6bc2f8.tar.gz
git-5c105a842eae59a3271f5db861ef8d85de6bc2f8.tar.bz2
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>
Diffstat (limited to 'builtin/config.c')
0 files changed, 0 insertions, 0 deletions