push: factor out the typical case

Only override dst on the odd case.

This allows a preemptive break on the `simple` case.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/push.c b/builtin/push.c
index da406fc89072b1f370505ab12c74a80e934ef70b..b5e951bf5946daa4c21e432407c340a66655c05b 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -231,14 +231,16 @@ static void setup_default_push_refspecs(struct remote *remote)
        if (!branch)
                die(_(message_detached_head_die), remote->name);
 
+       dst = branch->refname;
+
        switch (push_default) {
        default:
        case PUSH_DEFAULT_UNSPECIFIED:
        case PUSH_DEFAULT_SIMPLE:
-               if (same_remote)
-                       if (strcmp(branch->refname, get_upstream_ref(branch, remote->name)))
-                               die_push_simple(branch, remote);
-               dst = branch->refname;
+               if (!same_remote)
+                       break;
+               if (strcmp(branch->refname, get_upstream_ref(branch, remote->name)))
+                       die_push_simple(branch, remote);
                break;
 
        case PUSH_DEFAULT_UPSTREAM:
@@ -251,7 +253,6 @@ static void setup_default_push_refspecs(struct remote *remote)
                break;
 
        case PUSH_DEFAULT_CURRENT:
-               dst = branch->refname;
                break;
        }