From: Heiko Voigt <hvoigt@hvoigt.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Stefan Beller <sbeller@google.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
Jens Lehmann <Jens.Lehmann@web.de>,
Fredrik Gustafsson <iveqy@iveqy.com>,
Leandro Lucarella <leandro.lucarella@sociomantic.com>
Subject: Re: [PATCH 2/2] serialize collection of refs that contain submodule changes
Date: Mon, 19 Sep 2016 21:51:18 +0200 [thread overview]
Message-ID: <20160919195118.GB62429@book.hvoigt.net> (raw)
In-Reply-To: <xmqqd1k3losd.fsf@gitster.mtv.corp.google.com>
Hi,
On Fri, Sep 16, 2016 at 10:47:46AM -0700, Junio C Hamano wrote:
> One thing that makes me worried is how the ref cache layer interacts
> with this. I see you first call push_unpushed_submodules() when
> ON_DEMAND is set, which would result in pushes in submodule
> repositories, updating their remote tracking branches. At that
> point, before you make another call to find_unpushed_submodules(),
> is our cached ref layer knows that the remote tracking branches
> are now up to date (otherwise, we would incorrectly judge that these
> submodules need pushing based on stale information)?
I am not sure if I understand you correctly here. With the "ref cache layer"
you are referring to add_submodule_odb() which is called indirectly from
submodule_needs_pushing()? Those revs are only used to check whether the hash
we need on the remote side exists in the local submodule. That should not
change due to a push. The actual check whether the commit(s) exist on the
remote side is done using a 'rev-list' in a subprocess later.
> > diff --git a/transport.c b/transport.c
> > index 94d6dc3..76e1daf 100644
> > --- a/transport.c
> > +++ b/transport.c
> > @@ -903,23 +903,29 @@ int transport_push(struct transport *transport,
> >
> > if ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) && !is_bare_repository()) {
> > struct ref *ref = remote_refs;
> > + struct sha1_array hashes = SHA1_ARRAY_INIT;
> > +
> > for (; ref; ref = ref->next)
> > - if (!is_null_oid(&ref->new_oid) &&
> > - !push_unpushed_submodules(ref->new_oid.hash,
> > - transport->remote->name))
> > - die ("Failed to push all needed submodules!");
> > + if (!is_null_oid(&ref->new_oid))
> > + sha1_array_append(&hashes, ref->new_oid.hash);
> > +
> > + if (!push_unpushed_submodules(&hashes, transport->remote->name))
> > + die ("Failed to push all needed submodules!");
>
> Do we leak the contents of hashes here?
Good catch, sorry about that. Will clear the hashes array.
> > }
> >
> > if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND |
> > TRANSPORT_RECURSE_SUBMODULES_CHECK)) && !is_bare_repository()) {
> > struct ref *ref = remote_refs;
> > struct string_list needs_pushing = STRING_LIST_INIT_DUP;
> > + struct sha1_array hashes = SHA1_ARRAY_INIT;
> >
> > for (; ref; ref = ref->next)
> > - if (!is_null_oid(&ref->new_oid) &&
> > - find_unpushed_submodules(ref->new_oid.hash,
> > - transport->remote->name, &needs_pushing))
> > - die_with_unpushed_submodules(&needs_pushing);
> > + if (!is_null_oid(&ref->new_oid))
> > + sha1_array_append(&hashes, ref->new_oid.hash);
> > +
> > + if (find_unpushed_submodules(&hashes, transport->remote->name,
> > + &needs_pushing))
> > + die_with_unpushed_submodules(&needs_pushing);
>
> Do we leak the contents of hashes here? I do not think we need to
> worry about needs_pushing leaking, as we will always die if it is
> not empty, but it might be a better code hygiene to clear it as
> well.
As above, will fix.
Cheers Heiko
next prev parent reply other threads:[~2016-09-19 19:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-24 17:30 [PATCHv2] push: change submodule default to check Stefan Beller
2016-08-24 18:38 ` Junio C Hamano
[not found] ` <20160824183112.ceekegpzavnbybxp@sigill.intra.peff.net>
2016-08-24 19:37 ` Junio C Hamano
2016-08-24 21:26 ` Junio C Hamano
2016-08-24 22:37 ` Stefan Beller
2016-08-24 23:01 ` Jeff King
2016-09-14 17:31 ` [PATCH 1/2] serialize collection of changed submodules Heiko Voigt
2016-09-14 22:30 ` Junio C Hamano
2016-09-15 12:10 ` [PATCH 3/2] batch check whether submodule needs pushing into one call Heiko Voigt
2016-09-15 21:08 ` Junio C Hamano
2016-09-16 9:40 ` Heiko Voigt
2016-09-16 12:31 ` Heiko Voigt
2016-09-16 18:13 ` Junio C Hamano
2016-09-19 20:08 ` Heiko Voigt
2016-09-16 17:59 ` Junio C Hamano
2016-09-19 19:58 ` Heiko Voigt
2016-09-15 12:18 ` [PATCH 4/2] use actual start hashes for submodule push check instead of local refs Heiko Voigt
2016-09-16 17:27 ` [PATCH 1/2] serialize collection of changed submodules Junio C Hamano
2016-09-19 19:44 ` Heiko Voigt
2016-09-14 17:51 ` [PATCH 2/2] serialize collection of refs that contain submodule changes Heiko Voigt
2016-09-14 19:46 ` Heiko Voigt
2016-09-14 20:04 ` Stefan Beller
2016-09-16 17:47 ` Junio C Hamano
2016-09-19 19:51 ` Heiko Voigt [this message]
2016-09-19 20:09 ` 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=20160919195118.GB62429@book.hvoigt.net \
--to=hvoigt@hvoigt.net \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=iveqy@iveqy.com \
--cc=leandro.lucarella@sociomantic.com \
--cc=peff@peff.net \
--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).