From a2fab531bbb00ff64335906e22854365be2eb5c7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 21 Mar 2009 14:35:51 -0700 Subject: strbuf_check_branch_ref(): a helper to check a refname for a branch This allows a common calling sequence strbuf_branchname(&ref, name); strbuf_splice(&ref, 0, 0, "refs/heads/", 11); if (check_ref_format(ref.buf)) die(...); to be refactored into if (strbuf_check_branch_ref(&ref, name)) die(...); Signed-off-by: Junio C Hamano --- builtin-branch.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'builtin-branch.c') diff --git a/builtin-branch.c b/builtin-branch.c index 0df82bf96d..afeed68cfd 100644 --- 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) -- cgit v1.2.1