diff --git a/builtin-merge.c b/builtin-merge.c
index 4c119359e74cc483c47a6031f6057ac2eb06ca76..6a51823a55502766bee74dfd0a3857a8330a0f75 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
const char *ptr;
int len, early;
- len = strlen(remote);
- if (interpret_nth_last_branch(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);