[PATCH v2 1/2] remote: move "simple" @{push} resolution into a helper

From

Harald Nordgren via GitGitGadget <gitgitgadget@gmail.com>

Date

Oct 31, 2026, 08:04 UTC

Message-ID

<151fef69b9ec221b39fdbab1d46f0b123f9079e4.1793433841.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.2466.v2.git.git.1793433841.gitgitgadget@gmail.com>

From: Harald Nordgren <haraldnordgren@gmail.com>

No functional change.

Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
---
 remote.c | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/remote.c b/remote.c
index 49ee2ea318..d15d34aad7 100644
--- a/remote.c
+++ b/remote.c
@@ -1967,6 +1967,28 @@ static char *tracking_for_push_dest(struct repository *repo,
 	return ret;
 }
 
+static char *branch_get_push_simple(struct repository *repo,
+				    struct remote *remote,
+				    struct branch *branch,
+				    struct strbuf *err)
+{
+	const char *up;
+	char *cur;
+
+	up = branch_get_upstream(branch, err);
+	if (!up)
+		return NULL;
+	cur = tracking_for_push_dest(repo, remote, branch->refname, err);
+	if (!cur)
+		return NULL;
+	if (strcmp(cur, up)) {
+		free(cur);
+		return error_buf(err,
+				 _("cannot resolve 'simple' push to a single destination"));
+	}
+	return cur;
+}
+
 static char *branch_get_push_1(struct repository *repo,
 			       struct branch *branch, struct strbuf *err)
 {
@@ -2012,23 +2034,7 @@ static char *branch_get_push_1(struct repository *repo,
 
 	case PUSH_DEFAULT_UNSPECIFIED:
 	case PUSH_DEFAULT_SIMPLE:
-		{
-			const char *up;
-			char *cur;
-
-			up = branch_get_upstream(branch, err);
-			if (!up)
-				return NULL;
-			cur = tracking_for_push_dest(repo, remote, branch->refname, err);
-			if (!cur)
-				return NULL;
-			if (strcmp(cur, up)) {
-				free(cur);
-				return error_buf(err,
-						 _("cannot resolve 'simple' push to a single destination"));
-			}
-			return cur;
-		}
+		return branch_get_push_simple(repo, remote, branch, err);
 	}
 
 	BUG("unhandled push situation");

-- 
gitgitgadget