From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Brandon Williams <bmwill@google.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH 1/3] submodule.c: add has_submodules to check if we have any submodules
Date: Thu, 18 May 2017 09:34:31 -0700 [thread overview]
Message-ID: <CAGZ79ka3XBu-iNbvkp9yi5ovXVaAyTH9BY+M8HOj-Q6PEMB7iw@mail.gmail.com> (raw)
In-Reply-To: <xmqqshk2u3kz.fsf@gitster.mtv.corp.google.com>
On Wed, May 17, 2017 at 10:38 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> diff --git a/builtin/fetch.c b/builtin/fetch.c
>> index 4ef7a08afc..510ef1c9de 100644
>> --- a/builtin/fetch.c
>> +++ b/builtin/fetch.c
>> @@ -1344,7 +1344,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
>> set_config_fetch_recurse_submodules(arg);
>> }
>> gitmodules_config();
>> - git_config(submodule_config, NULL);
>> + load_submodule_config();
>> }
>>
>> ...
>> +static enum {
>> + SUBMODULE_CONFIG_NOT_READ = 0,
>> + SUBMODULE_CONFIG_NO_CONFIG,
>> + SUBMODULE_CONFIG_EXISTS,
>> +} submodule_config_reading;
>> +
>> /*
>> * The following flag is set if the .gitmodules file is unmerged. We then
>> * disable recursion for all submodules where .git/config doesn't have a
>> @@ -83,6 +89,62 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
>> return 0;
>> }
>>
>> +static int submodule_config(const char *var, const char *value, void *cb)
>> +{
>> + if (!strcmp(var, "submodule.fetchjobs")) {
>> +...
>> + }
>> + return 0;
>> +}
>> +
>> +void load_submodule_config(void)
>> +{
>> + submodule_config_reading = SUBMODULE_CONFIG_NO_CONFIG;
>> + git_config(submodule_config, NULL);
>> +}
>
> OK, so anybody who does the git_config(submodule_config) must
> instead call this one, so that we can notice there is some
> "submodule" stuff configured. And that is ensured by making
> submodule_config private to this module.
Exactly.
> Nicely done.
Thanks.
>
> On a possibly related tangent, I've often found it somewhat
> irritating that that these two calls have to go hand-in-hand.
>
>> gitmodules_config();
>> - git_config(submodule_config, NULL);
>
> I wonder if it makes sense to roll that gitmodule_config() thing
> into this function as well?
This patch has been sitting on my hard drive for quite a while
and I just vaguely remember that I did not do that for some
complication along the way. I'll re-examine the situation.
Thanks,
Stefan
next prev parent reply other threads:[~2017-05-18 16:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-17 21:31 [PATCH 0/3] Add option to recurse into submodules Stefan Beller
2017-05-17 21:31 ` [PATCH 1/3] submodule.c: add has_submodules to check if we have any submodules Stefan Beller
2017-05-18 5:38 ` Junio C Hamano
2017-05-18 16:34 ` Stefan Beller [this message]
2017-05-18 15:35 ` Brandon Williams
2017-05-18 16:38 ` Stefan Beller
2017-05-18 19:00 ` Brandon Williams
2017-05-18 19:15 ` Stefan Beller
2017-05-17 21:31 ` [PATCH 2/3] submodule test invocation: only pass additional arguments Stefan Beller
2017-05-17 21:31 ` [PATCH 3/3] Introduce submodule.recurse option Stefan Beller
2017-05-18 15:39 ` Brandon Williams
2017-05-18 16:20 ` Stefan Beller
2017-05-18 19:05 ` [PATCH 0/3] Add option to recurse into submodules Brandon Williams
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=CAGZ79ka3XBu-iNbvkp9yi5ovXVaAyTH9BY+M8HOj-Q6PEMB7iw@mail.gmail.com \
--to=sbeller@google.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).