[PATCH] pull: honor submodule.recurse config option
- From
Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
- Date
- Sep 1, 2017, 07:29 UTC
- Message-ID
- <cc70ea38-9980-120f-afaa-af7a6e3a8c36@morey-chaisemartin.com>
- In-Reply-To
- <eba8e727-25ef-b34b-cd2b-e92602709c9b@homann.se>
git pull used to not parse the submodule.recurse config option and simply consider the --recurse-submodules CLI option. When using the config option, submodules would only be fetched recursively while the CLi option would tigger both fetch and update/merge.
Reported-by: Magnus Homann <magnus@homann.se> Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com> --- builtin/pull.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/builtin/pull.c b/builtin/pull.c index 7fe281414..e4edf23c5 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -326,6 +326,11 @@ static int git_pull_config(const char *var, const char *value, void *cb) config_autostash = git_config_bool(var, value); return 0; } + if (!strcmp(var, "submodule.recurse")) { + int r = git_config_bool(var, value) ? + RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF; + recurse_submodules = r; + } return git_default_config(var, value, cb); }
-- 2.14.1.460.g196d2604f