Merge branch 'rs/merge-microcleanup' into next

diff --git a/builtin/merge.c b/builtin/merge.c
index e15f00895043081441ed3a64128515d6a7251e22..328945d6093aae40410b0c437a21c588ac6d6692 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1117,8 +1117,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
         * current branch.
         */
        branch = branch_to_free = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
-       if (branch && starts_with(branch, "refs/heads/"))
-               branch += 11;
+       if (branch)
+               skip_prefix(branch, "refs/heads/", &branch);
        if (!branch || is_null_oid(&head_oid))
                head_commit = NULL;
        else