docs/checkout: clarify what "non-branch" means

[git.git] / builtin-merge.c

diff --git a/builtin-merge.c b/builtin-merge.c
index e94ea7c35f73bd5e939cab93cf860039a757f9a9..6a51823a55502766bee74dfd0a3857a8330a0f75 100644 (file)
--- 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);