[PATCH v2 04/13] push: factor out null branch check
No need to do it in every single function.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/push.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/builtin/push.c b/builtin/push.c
index f64b7100f0..8fcbd2878d 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -206,8 +206,6 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch,
int same_remote)
{
const char *upstream_ref;
- if (!branch)
- die(_(message_detached_head_die), remote->name);
upstream_ref = get_upstream_ref(branch, remote->name);
if (!same_remote)
die(_("You are pushing to remote '%s', which is not the upstream of\n"
@@ -220,16 +218,11 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch,
static void setup_push_current(struct remote *remote, struct branch *branch)
{
- if (!branch)
- die(_(message_detached_head_die), remote->name);
refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname);
}
static void setup_push_simple(struct remote *remote, struct branch *branch, int same_remote)
{
- if (!branch)
- die(_(message_detached_head_die), remote->name);
-
if (same_remote) {
const char *upstream_ref;
@@ -266,6 +259,9 @@ static void setup_default_push_refspecs(struct remote *remote)
break;
}
+ if (!branch)
+ die(_(message_detached_head_die), remote->name);
+
switch (push_default) {
default:
case PUSH_DEFAULT_UNSPECIFIED:
--
2.32.0.rc0
Felipe Contreras <felipe.contreras@gmail.com>