From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon, 31 May 2021 19:51:20 +0000 (-0500)
Subject: push: factor out the typical case
X-Git-Tag: v2.33.0-rc0~68^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f934725f7597366c981b72be6597124e2c21a77;p=thirdparty%2Fgit.git

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 da406fc890..b5e951bf59 100644
--- 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;
 	}