From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH] submodule: use cheaper check for submodule pushes
Date: Wed, 12 Jul 2017 16:45:04 -0700 [thread overview]
Message-ID: <20170712234504.15811-1-sbeller@google.com> (raw)
In the function push_submodule[1] we use add_submodule_odb[2] to determine
if a submodule has been populated. However the function does not work with
the submodules objects that are added, instead a new child process is used
to perform the actual push in the submodule.
Use is_submodule_populated[3] that is cheaper to guard from unpopulated
submodules.
[1] 'push_submodule' was added in eb21c732d6 (push: teach
--recurse-submodules the on-demand option, 2012-03-29)
[2] 'add_submodule_odb' was introduced in 752c0c2492 (Add the
--submodule option to the diff option family, 2009-10-19)
[3] 'is_submodule_populated' was added in 5688c28d81 (submodules:
add helper to determine if a submodule is populated, 2016-12-16)
Signed-off-by: Stefan Beller <sbeller@google.com>
---
submodule.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/submodule.c b/submodule.c
index da2b484879..55afad3e8c 100644
--- a/submodule.c
+++ b/submodule.c
@@ -976,7 +976,9 @@ static int push_submodule(const char *path,
const struct string_list *push_options,
int dry_run)
{
- if (add_submodule_odb(path))
+ int code;
+
+ if (!is_submodule_populated_gently(path, &code))
return 1;
if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
--
2.13.2.695.g117ddefdb4
next reply other threads:[~2017-07-12 23:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-12 23:45 Stefan Beller [this message]
2017-07-13 0:01 ` [PATCH] submodule: use cheaper check for submodule pushes Jonathan Nieder
2017-07-13 0:09 ` Stefan Beller
2017-07-13 0:53 ` Junio C Hamano
2017-07-13 5:14 ` Stefan Beller
2017-07-13 18:37 ` Junio C Hamano
2017-07-13 19:39 ` Stefan Beller
2017-07-13 20:48 ` Jonathan Nieder
2017-07-13 20:54 ` Stefan Beller
2017-08-15 22:43 ` [PATCH] push: do not add submodule odb as an alternate when recursing on demand Stefan Beller
2017-08-15 23:10 ` Jonathan Nieder
2017-08-15 23:14 ` Jonathan Nieder
2017-08-15 23:27 ` Stefan Beller
2017-08-15 23:23 ` Junio C Hamano
2017-08-15 23:31 ` Stefan Beller
2017-08-16 0:11 ` Junio C Hamano
2017-08-16 1:05 ` Stefan Beller
2017-08-16 2:08 ` Jonathan Nieder
2017-08-16 5:52 ` Stefan Beller
2017-08-16 16:35 ` Heiko Voigt
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=20170712234504.15811-1-sbeller@google.com \
--to=sbeller@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.