From 121e43fa53ca6d874aa3e5a7664c9b769f2cbfa6 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 6 Sep 2017 08:48:09 +0200 Subject: pull: honor submodule.recurse config option "git pull" supports a --recurse-submodules option but does not parse the submodule.recurse configuration item to set the default for that option. Meanwhile "git fetch" does support submodule.recurse, producing confusing behavior: when submodule.recurse is enabled, "git pull" recursively fetches submodules but does not update them after fetch. Handle submodule.recurse in "git pull" to fix this. Reported-by: Magnus Homann Signed-off-by: Nicolas Morey-Chaisemartin Signed-off-by: Junio C Hamano --- builtin/pull.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'builtin/pull.c') diff --git a/builtin/pull.c b/builtin/pull.c index 9ef1ab5015..6f772e8a22 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -325,6 +325,10 @@ static int git_pull_config(const char *var, const char *value, void *cb) if (!strcmp(var, "rebase.autostash")) { config_autostash = git_config_bool(var, value); return 0; + } else if (!strcmp(var, "submodule.recurse")) { + recurse_submodules = git_config_bool(var, value) ? + RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF; + return 0; } return git_default_config(var, value, cb); } -- cgit v1.3