From: Jonathan Nieder <jrnieder@gmail.com>
To: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
Cc: git@vger.kernel.org, magnus@homann.se
Subject: Re: [PATCH] pull: honor submodule.recurse config option
Date: Fri, 1 Sep 2017 10:28:15 -0700 [thread overview]
Message-ID: <20170901172815.GA143138@aiede.mtv.corp.google.com> (raw)
In-Reply-To: <cc70ea38-9980-120f-afaa-af7a6e3a8c36@morey-chaisemartin.com>
Hi,
Nicolas Morey-Chaisemartin wrote:
> 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>
nits:
* Git's commit messages usually use the present tense to describe the
behavior of Git in absence of a patch, as though writing a bug report.
They use the imperative mood to describe what the patch will do, as
though commanding the code to do better.
* spelling: s/CLi/CLI/; s/tigger/trigger/
* please also wrap lines consistently
That would make
"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.
> ---
> builtin/pull.c | 5 +++++
> 1 file changed, 5 insertions(+)
Can you add a test to avoid future changes causing this to regress?
See t/t5572-pull-submodule.sh for some existing tests to get
inspiration from.
> 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);
> }
>
The rest looks good.
Thanks for working on this,
Jonathan
prev parent reply other threads:[~2017-09-01 17:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-01 5:39 submodule: --recurse-submodules vs. submodule.recurse=true Magnus Homann
2017-09-01 7:29 ` [PATCH] pull: honor submodule.recurse config option Nicolas Morey-Chaisemartin
2017-09-01 17:11 ` Stefan Beller
2017-09-01 18:15 ` René Scharfe
2017-09-01 17:28 ` Jonathan Nieder [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170901172815.GA143138@aiede.mtv.corp.google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=magnus@homann.se \
--cc=nicolas@morey-chaisemartin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).