From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, peff@peff.net, hvoigt@hvoigt.net,
torvalds@linux-foundation.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/2] builtin/push: move flags do_push
Date: Tue, 4 Oct 2016 12:29:10 -0700 [thread overview]
Message-ID: <20161004192910.30649-2-sbeller@google.com> (raw)
In-Reply-To: <20161004192910.30649-1-sbeller@google.com>
In do_push we set the flags for other options, so let's make the code
more consistent and also apply the flags for recursing into submodules
there.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
No functional change intended, just a cleanup while we're at it.
Feel free to drop if it's too much churn.
builtin/push.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/push.c b/builtin/push.c
index 06fd3bd..6690301 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -388,6 +388,11 @@ static int do_push(const char *repo, int flags,
" git push <name>\n"));
}
+ if (recurse_submodules == RECURSE_SUBMODULES_CHECK)
+ flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK;
+ else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
+ flags |= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND;
+
if (remote->mirror)
flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
@@ -576,11 +581,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
if (deleterefs && argc < 2)
die(_("--delete doesn't make sense without any refs"));
- if (recurse_submodules == RECURSE_SUBMODULES_CHECK)
- flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK;
- else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
- flags |= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND;
-
if (tags)
add_refspec("refs/tags/*");
--
2.10.0.129.g35f6318
next prev parent reply other threads:[~2016-10-04 19:29 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-03 21:11 Slow pushes on 'pu' - even when up-to-date Linus Torvalds
2016-10-03 21:17 ` Stefan Beller
2016-10-03 21:23 ` Stefan Beller
2016-10-03 22:06 ` Junio C Hamano
2016-10-04 11:18 ` Heiko Voigt
2016-10-04 11:44 ` Jeff King
2016-10-04 12:04 ` Heiko Voigt
2016-10-04 12:07 ` Jeff King
2016-10-04 16:19 ` Junio C Hamano
2016-10-04 16:21 ` Jeff King
2016-10-04 16:40 ` [PATCH] push: change submodule default to check Stefan Beller
2016-10-04 17:34 ` Jeff King
2016-10-04 17:48 ` Stefan Beller
2016-10-04 17:54 ` Jeff King
2016-10-04 18:04 ` Junio C Hamano
2016-10-04 18:08 ` Stefan Beller
2016-10-04 18:28 ` Jeff King
2016-10-04 19:29 ` [PATCHv2 1/2] push: change submodule default to check when submodules exist Stefan Beller
2016-10-04 19:29 ` Stefan Beller [this message]
2016-10-04 19:39 ` Jeff King
2016-10-04 19:51 ` Stefan Beller
2016-10-04 21:03 ` [PATCHv3 " Stefan Beller
2016-10-05 13:53 ` Heiko Voigt
2016-10-06 9:23 ` Heiko Voigt
2016-10-06 17:20 ` Stefan Beller
2016-10-07 12:41 ` Heiko Voigt
2016-10-05 15:47 ` Jeff King
2016-10-05 15:54 ` Stefan Beller
2016-10-04 18:00 ` [PATCH] push: change submodule default to check Junio C Hamano
2016-10-04 18:02 ` Junio C Hamano
2016-10-04 18:05 ` Stefan Beller
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=20161004192910.30649-2-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.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.