From: Junio C Hamano <gitster@pobox.com>
To: Glen Choo <chooglen@google.com>
Cc: git@vger.kernel.org, Benedek Kozma <cyberbeni@gmail.com>
Subject: Re: Bugreport - submodules are fetched twice in some cases
Date: Mon, 16 May 2022 11:25:03 -0700 [thread overview]
Message-ID: <xmqq4k1p2v40.fsf@gitster.g> (raw)
In-Reply-To: <kl6l7d6ljrrg.fsf@chooglen-macbookpro.roam.corp.google.com> (Glen Choo's message of "Mon, 16 May 2022 10:45:23 -0700")
Glen Choo <chooglen@google.com> writes:
> I don't think we are in the ideal scenario because we only snapshot when
> we fetch without "--all":
>
> cmd_fetch() > *fetch_one()* > do_fetch() > backfill_tags() >
> fetch_and_consume_refs() > store_updated_refs() >
> check_for_new_submodule_commits()
>
> In the ideal scenario, it would be something like:
>
> cmd_fetch() >
> TODO_snapshot_old_refs(), fetch_[one|multiple](),
> TODO_register_new_refs()
>
> It looks non-trivial enough that I don't think I'll try to fix this
> soon, but it does not look prohibitively hard.
It matches my gut feeling.
>> Provided if we have the "make sure everything needed in the
>> submodule is fetched by inspecting the range of commits we fetch for
>> a superproject" working correctly for a single remote, an
>> alternative approach is to run "git fetch --recurse-submodules" for
>> each remote separately, without the "parent" process doing anything
>> in the submodule (i.e. you earlier counted R+1 fetches, but instead,
>> we make R fetches in the submodule. It is less than ideal but it
>> may be easier to implement).
>>
>> Thoughts?
>
> The +1 fetch is redundant, so it's probably good to get rid of it
> anyway.
Sounds sensible. It should be a single-liner, i.e.
builtin/fetch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git i/builtin/fetch.c w/builtin/fetch.c
index eeee5ac8f1..be61c390c1 100644
--- i/builtin/fetch.c
+++ w/builtin/fetch.c
@@ -2262,7 +2262,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
result = fetch_multiple(&list, max_children);
}
- if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
+ if (!result && remote && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
struct strvec options = STRVEC_INIT;
int max_children = max_jobs;
next prev parent reply other threads:[~2022-05-16 18:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 14:46 Bugreport - submodules are fetched twice in some cases Benedek Kozma
2022-04-29 17:39 ` Junio C Hamano
2022-04-29 19:05 ` Glen Choo
2022-04-29 20:02 ` Junio C Hamano
2022-04-29 20:37 ` Glen Choo
2022-05-14 0:07 ` Glen Choo
2022-05-14 5:24 ` Junio C Hamano
2022-05-16 17:45 ` Glen Choo
2022-05-16 18:25 ` Junio C Hamano [this message]
2022-05-16 19:04 ` Junio C Hamano
2022-05-16 21:53 ` [PATCH] fetch: do not run a redundant fetch from submodule Junio C Hamano
2022-05-16 22:56 ` Glen Choo
2022-05-16 23:33 ` Junio C Hamano
2022-05-16 23:53 ` [PATCH v2] " Junio C Hamano
2022-05-17 16:47 ` Glen Choo
2022-05-18 15:53 ` Junio C Hamano
2022-05-14 0:15 ` Bugreport - submodules are fetched twice in some cases Glen Choo
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4k1p2v40.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=chooglen@google.com \
--cc=cyberbeni@gmail.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).