From: Junio C Hamano <gitster@pobox.com> To: Stefan Beller <sbeller@google.com> Cc: git@vger.kernel.org, sjon@parse.nl Subject: Re: [PATCH] submodule update: run at most one fetch job unless otherwise set Date: Fri, 14 Dec 2018 11:53:59 +0900 Message-ID: <xmqqwoocddiw.fsf@gitster-ct.c.googlers.com> (raw) In-Reply-To: <20181213190248.247083-1-sbeller@google.com> (Stefan Beller's message of "Thu, 13 Dec 2018 11:02:48 -0800") Stefan Beller <sbeller@google.com> writes: > From: Junio C Hamano <gitster@pobox.com> > > In a028a1930c (fetching submodules: respect `submodule.fetchJobs` > config option, 2016-02-29), we made sure to keep the default behavior > of a fetching at most one submodule at once when not setting the > newly introduced `submodule.fetchJobs` config. > > This regressed in 90efe595c5 (builtin/submodule--helper: factor > out submodule updating, 2018-08-03). Fix it. > > Reported-by: Sjon Hortensius <sjon@parse.nl> > Signed-off-by: Junio C Hamano <gitster@pobox.com> > Signed-off-by: Stefan Beller <sbeller@google.com> > --- Thanks for tying the loose ends. We may want to convert the _INIT macro to use the designated initializers; I had to count the fields twice to make sure I was tweaking the right one. It did not help that I saw, before looking at the current code, that 90efe595c5 added one field at the end to the struct but did not touch _INIT macro at all. That made me guess that max_jobs=0 was due to _missing_ initialization value, leading me to an incorrect fix to append an extra 1 at the end, but that was bogus. The missing initialization left by 90efe595 ("builtin/submodule--helper: factor out submodule updating", 2018-08-03) was silently fixed by f1d15713 ("builtin/submodule--helper: store update_clone information in a struct", 2018-08-03), I think, so replacing the 0 at the end is 1 happens to be the right fix, but with designated initializers, all these confusions are more easily avoided. > builtin/submodule--helper.c | 2 +- > t/t5526-fetch-submodules.sh | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c > index d38113a31a..1f8a4a9d52 100644 > --- a/builtin/submodule--helper.c > +++ b/builtin/submodule--helper.c > @@ -1551,7 +1551,7 @@ struct submodule_update_clone { > #define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \ > SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, \ > NULL, NULL, NULL, \ > - NULL, 0, 0, 0, NULL, 0, 0, 0} > + NULL, 0, 0, 0, NULL, 0, 0, 1} > > > static void next_submodule_warn_missing(struct submodule_update_clone *suc, > diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh > index 6c2f9b2ba2..a0317556c6 100755 > --- a/t/t5526-fetch-submodules.sh > +++ b/t/t5526-fetch-submodules.sh > @@ -524,6 +524,8 @@ test_expect_success 'fetching submodules respects parallel settings' ' > git config fetch.recurseSubmodules true && > ( > cd downstream && > + GIT_TRACE=$(pwd)/trace.out git fetch && > + grep "1 tasks" trace.out && > GIT_TRACE=$(pwd)/trace.out git fetch --jobs 7 && > grep "7 tasks" trace.out && > git config submodule.fetchJobs 8 &&
prev parent reply other threads:[~2018-12-14 2:54 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-13 9:15 2.20.0 - Undocumented change in submodule update wrt # parallel jobs Sjon Hortensius 2018-12-13 14:02 ` Ævar Arnfjörð Bjarmason 2018-12-13 14:17 ` Junio C Hamano 2018-12-13 18:50 ` Stefan Beller 2018-12-13 19:02 ` [PATCH] submodule update: run at most one fetch job unless otherwise set Stefan Beller 2018-12-13 19:04 ` Eric Sunshine 2018-12-14 2:53 ` Junio C Hamano [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=xmqqwoocddiw.fsf@gitster-ct.c.googlers.com \ --to=gitster@pobox.com \ --cc=git@vger.kernel.org \ --cc=sbeller@google.com \ --cc=sjon@parse.nl \ /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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git