From: Brandon Williams <bmwill@google.com>
To: Stefan Beller <sbeller@google.com>
Cc: Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH v3 04/10] submodule--helper clone: check for configured submodules using helper
Date: Tue, 14 Mar 2017 17:10:06 -0700 [thread overview]
Message-ID: <20170315001006.GG168037@google.com> (raw)
In-Reply-To: <CAGZ79kZ20Jy_A8SPJte7U0iZZB97P0Sn_PqAMfwp40sAj6Y=RA@mail.gmail.com>
On 03/14, Stefan Beller wrote:
> On Tue, Mar 14, 2017 at 11:06 AM, Junio C Hamano <gitster@pobox.com> wrote:
> > Brandon Williams <bmwill@google.com> writes:
> >
> >> - /*
> >> - * Looking up the url in .git/config.
> >> - * We must not fall back to .gitmodules as we only want
> >> - * to process configured submodules.
> >> - */
> >> - strbuf_reset(&sb);
> >> - strbuf_addf(&sb, "submodule.%s.url", sub->name);
> >> - git_config_get_string(sb.buf, &url);
> >> - if (!url) {
> >> + /* Check if the submodule has been initialized. */
> >> + if (!is_submodule_initialized(ce->name)) {
> >> next_submodule_warn_missing(suc, out, displaypath);
> >> goto cleanup;
> >> }
> >> @@ -835,7 +827,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
> >> argv_array_push(&child->args, "--depth=1");
> >> argv_array_pushl(&child->args, "--path", sub->path, NULL);
> >> argv_array_pushl(&child->args, "--name", sub->name, NULL);
> >> - argv_array_pushl(&child->args, "--url", url, NULL);
> >> + argv_array_pushl(&child->args, "--url", sub->url, NULL);
> >
> > Even without this patch, we already had an instance of struct submodule
> > available in this function, so the query to .git/config this patch removed
> > was unnecessary?
> >
> > I am wondering what was meant by the comment "We must not fall back to..."
> > that is being removed---is that because sub->url can come from .gitmodules
> > that is in-tree, not from .git/config?
>
> Yes. We want to check for the submodule being "initialized", i.e.
> having a url in .git/config. (and the struct submodule reads in both .git/config
> and .gitmodules and overlays them with a given precedence order)
>
> > If that is the case, doesn't the
> > change in this hunk change behaviour from using the URL the user prefers
> > to using the URL the upstream suggests, overriding user's configuration?
>
> The mentioned precedence makes sure to have the right order:
>
> /* Overlay the parsed .gitmodules file with .git/config */
> gitmodules_config();
> git_config(submodule_config, NULL);
>
> such that the sub->url is correct as a URL, but not correct as a boolean
> indicator if the submodule is "initialized".
Thanks for clarifying this.
--
Brandon Williams
next prev parent reply other threads:[~2017-03-15 0:10 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 23:47 [PATCH 00/10] decoupling a submodule's existence and its url Brandon Williams
2017-02-23 23:47 ` [PATCH 01/10] submodule: decouple url and submodule existence Brandon Williams
2017-02-24 21:02 ` Junio C Hamano
2017-03-01 20:02 ` Brandon Williams
2017-03-01 21:53 ` Stefan Beller
2017-03-06 18:50 ` Brandon Williams
2017-03-02 5:43 ` Junio C Hamano
2017-02-23 23:47 ` [PATCH 02/10] submodule update: add `--init-active` switch Brandon Williams
2017-02-23 23:47 ` [PATCH 03/10] clone: add --submodule-spec=<pathspec> switch Brandon Williams
2017-02-23 23:47 ` [PATCH 04/10] completion: clone can initialize specific submodules Brandon Williams
2017-02-23 23:47 ` [PATCH 05/10] submodule--helper: add is_active command Brandon Williams
2017-02-24 1:15 ` Stefan Beller
2017-02-27 18:35 ` Brandon Williams
2017-02-23 23:47 ` [PATCH 06/10] submodule add: respect submodule.active Brandon Williams
2017-02-23 23:47 ` [PATCH 07/10] submodule status: use submodule--helper is-active Brandon Williams
2017-02-23 23:47 ` [PATCH 08/10] submodule deinit: use most reliable url Brandon Williams
2017-02-23 23:47 ` [PATCH 09/10] submodule sync: use submodule--helper is-active Brandon Williams
2017-02-23 23:47 ` [PATCH 10/10] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-02-24 0:58 ` Stefan Beller
2017-02-27 18:38 ` Brandon Williams
2017-02-23 23:58 ` [PATCH 00/10] decoupling a submodule's existence and its url Stefan Beller
2017-03-09 1:23 ` [PATCH v2 00/11] " Brandon Williams
2017-03-09 1:23 ` [PATCH v2 01/11] submodule--helper: add is_active command Brandon Williams
2017-03-09 1:23 ` [PATCH v2 02/11] submodule status: use submodule--helper is-active Brandon Williams
2017-03-09 1:23 ` [PATCH v2 03/11] submodule deinit: use most reliable url Brandon Williams
2017-03-09 1:56 ` Stefan Beller
2017-03-09 18:15 ` Brandon Williams
2017-03-09 1:23 ` [PATCH v2 04/11] submodule sync: use submodule--helper is-active Brandon Williams
2017-03-09 1:23 ` [PATCH v2 05/11] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-03-09 1:23 ` [PATCH v2 06/11] submodule: decouple url and submodule existence Brandon Williams
2017-03-09 1:23 ` [PATCH v2 07/11] submodule update: add `--init-active` switch Brandon Williams
2017-03-09 2:16 ` Stefan Beller
2017-03-09 18:08 ` Brandon Williams
2017-03-09 1:23 ` [PATCH v2 08/11] clone: add --submodule-spec=<pathspec> switch Brandon Williams
2017-03-09 1:23 ` [PATCH v2 09/11] completion: clone can initialize specific submodules Brandon Williams
2017-03-09 1:23 ` [PATCH v2 10/11] submodule--helper init: set submodule.<name>.active Brandon Williams
2017-03-09 2:28 ` Stefan Beller
2017-03-09 17:56 ` Brandon Williams
2017-03-09 1:23 ` [PATCH v2 11/11] submodule add: respect submodule.active and submodule.<name>.active Brandon Williams
2017-03-13 21:43 ` [PATCH v3 00/10] decoupling a submodule's existence and its url Brandon Williams
2017-03-13 21:43 ` [PATCH v3 01/10] submodule--helper: add is_active command Brandon Williams
2017-03-13 22:36 ` Stefan Beller
2017-03-14 17:40 ` Junio C Hamano
2017-03-14 22:44 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 02/10] submodule status: use submodule--helper is-active Brandon Williams
2017-03-14 17:46 ` Junio C Hamano
2017-03-14 18:16 ` Stefan Beller
2017-03-14 20:20 ` Junio C Hamano
2017-03-14 21:33 ` Junio C Hamano
2017-03-14 22:50 ` Brandon Williams
2017-03-14 23:36 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 03/10] submodule sync: " Brandon Williams
2017-03-14 17:53 ` Junio C Hamano
2017-03-14 23:50 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 04/10] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-03-14 18:06 ` Junio C Hamano
2017-03-14 18:40 ` Stefan Beller
2017-03-14 20:25 ` Junio C Hamano
2017-03-15 0:10 ` Brandon Williams [this message]
2017-03-13 21:43 ` [PATCH v3 05/10] submodule: decouple url and submodule existence Brandon Williams
2017-03-13 22:49 ` Stefan Beller
2017-03-15 17:38 ` Brandon Williams
2017-03-14 18:42 ` Junio C Hamano
2017-03-14 21:38 ` Junio C Hamano
2017-03-15 21:37 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 06/10] submodule update: add `--init-active` switch Brandon Williams
2017-03-14 19:18 ` Junio C Hamano
2017-03-15 21:52 ` Brandon Williams
2017-03-14 19:28 ` Junio C Hamano
2017-03-15 21:42 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 07/10] clone: add --submodule-spec=<pathspec> switch Brandon Williams
2017-03-14 19:38 ` Junio C Hamano
2017-03-15 23:08 ` Brandon Williams
2017-03-15 23:25 ` Stefan Beller
2017-03-13 21:43 ` [PATCH v3 08/10] completion: clone can initialize specific submodules Brandon Williams
2017-03-13 21:43 ` [PATCH v3 09/10] submodule--helper init: set submodule.<name>.active Brandon Williams
2017-03-14 19:43 ` Junio C Hamano
2017-03-15 22:46 ` Brandon Williams
2017-03-16 16:47 ` Junio C Hamano
2017-03-13 21:43 ` [PATCH v3 10/10] submodule add: respect submodule.active and submodule.<name>.active Brandon Williams
2017-03-14 19:48 ` Junio C Hamano
2017-03-15 21:59 ` Brandon Williams
2017-03-13 22:51 ` [PATCH v3 00/10] decoupling a submodule's existence and its url Stefan Beller
2017-03-14 21:40 ` Junio C Hamano
2017-03-14 22:17 ` Brandon Williams
2017-03-16 22:29 ` [PATCH v4 00/10] decoupling url and submodule interest Brandon Williams
2017-03-16 22:29 ` [PATCH v4 01/10] submodule--helper: add is-active subcommand Brandon Williams
2017-03-16 22:29 ` [PATCH v4 02/10] submodule status: use submodule--helper is-active Brandon Williams
2017-03-16 22:29 ` [PATCH v4 03/10] submodule sync: skip work for inactive submodules Brandon Williams
2017-03-16 23:24 ` Stefan Beller
2017-03-16 23:25 ` Stefan Beller
2017-03-16 23:26 ` Brandon Williams
2017-03-17 5:26 ` Junio C Hamano
2017-03-17 6:58 ` Brandon Williams
2017-03-17 17:28 ` Junio C Hamano
2017-03-16 22:29 ` [PATCH v4 04/10] submodule sync: use submodule--helper is-active Brandon Williams
2017-03-16 22:29 ` [PATCH v4 05/10] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-03-16 22:29 ` [PATCH v4 06/10] submodule: decouple url and submodule interest Brandon Williams
2017-03-16 23:45 ` Stefan Beller
2017-03-16 22:29 ` [PATCH v4 07/10] submodule init: initialize active submodules Brandon Williams
2017-03-17 18:17 ` Stefan Beller
2017-03-17 22:28 ` Brandon Williams
2017-03-17 23:25 ` Stefan Beller
2017-03-16 22:29 ` [PATCH v4 08/10] clone: teach --recurse-submodules to optionally take a pathspec Brandon Williams
2017-03-17 17:37 ` Stefan Beller
2017-03-17 21:28 ` Brandon Williams
2017-03-16 22:29 ` [PATCH v4 09/10] submodule--helper init: set submodule.<name>.active Brandon Williams
2017-03-17 17:22 ` Stefan Beller
2017-03-17 21:55 ` Brandon Williams
2017-03-16 22:29 ` [PATCH v4 10/10] submodule add: respect submodule.active and submodule.<name>.active Brandon Williams
2017-03-17 22:37 ` [PATCH v5 00/10] decoupling url and submodule interest Brandon Williams
2017-03-17 22:37 ` [PATCH v5 01/10] submodule--helper: add is-active subcommand Brandon Williams
2017-03-17 22:37 ` [PATCH v5 02/10] submodule status: use submodule--helper is-active Brandon Williams
2017-03-17 22:37 ` [PATCH v5 03/10] submodule sync: skip work for inactive submodules Brandon Williams
2017-03-17 22:37 ` [PATCH v5 04/10] submodule sync: use submodule--helper is-active Brandon Williams
2017-03-17 22:38 ` [PATCH v5 05/10] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-03-17 22:38 ` [PATCH v5 06/10] submodule: decouple url and submodule interest Brandon Williams
2017-03-17 22:38 ` [PATCH v5 07/10] submodule init: initialize active submodules Brandon Williams
2017-03-17 22:38 ` [PATCH v5 08/10] clone: teach --recurse-submodules to optionally take a pathspec Brandon Williams
2017-03-17 22:38 ` [PATCH v5 09/10] submodule--helper init: set submodule.<name>.active Brandon Williams
2017-03-17 22:38 ` [PATCH v5 10/10] submodule add: respect submodule.active and submodule.<name>.active Brandon Williams
2017-03-17 23:25 ` [PATCH v5 00/10] decoupling url and submodule interest Stefan Beller
2017-03-18 17:00 ` Junio C Hamano
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=20170315001006.GG168037@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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).