X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-merge.c;h=6a51823a55502766bee74dfd0a3857a8330a0f75;hb=0808723b5065cc2141c2715a2df78882c158d4ef;hp=e94ea7c35f73bd5e939cab93cf860039a757f9a9;hpb=431b1969fcde69959a23355fba6894fb69c8fa0c;p=git.git

diff --git a/builtin-merge.c b/builtin-merge.c
index e94ea7c35..6a51823a5 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -360,9 +360,8 @@ static void merge_name(const char *remote, struct strbuf *msg)
 	const char *ptr;
 	int len, early;
 
-	len = strlen(remote);
-	if (interpret_branch_name(remote, &bname) == len)
-		remote = bname.buf;
+	strbuf_branchname(&bname, remote);
+	remote = bname.buf;
 
 	memset(branch_head, 0, sizeof(branch_head));
 	remote_head = peel_to_type(remote, 0, NULL, OBJ_COMMIT);