strbuf_check_branch_ref(): a helper to check a refname for a branch

[git.git] / builtin-branch.c

diff --git a/builtin-branch.c b/builtin-branch.c
index 0df82bf96d7f06426ac0ff89f3410714257c20fd..afeed68cfd7482c40a276c00ef3b7bfd09433950 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -468,14 +468,10 @@ static void rename_branch(const char *oldname, const char *newname, int force)
        if (!oldname)
                die("cannot rename the current branch while not on any.");
 
-       strbuf_branchname(&oldref, oldname);
-       strbuf_splice(&oldref, 0, 0, "refs/heads/", 11);
-       if (check_ref_format(oldref.buf))
+       if (strbuf_check_branch_ref(&oldref, oldname))
                die("Invalid branch name: '%s'", oldname);
 
-       strbuf_branchname(&newref, newname);
-       strbuf_splice(&newref, 0, 0, "refs/heads/", 11);
-       if (check_ref_format(newref.buf))
+       if (strbuf_check_branch_ref(&newref, newname))
                die("Invalid branch name: '%s'", newname);
 
        if (resolve_ref(newref.buf, sha1, 1, NULL) && !force)