refs: drop strbuf_ prefix from helpers
The helper functions (strbuf_branchname, strbuf_check_branch_ref, and strbuf_check_tag_ref) are about handling branch and tag names, and it is a non-essential fact that these functions use strbuf to hold these names. Rename them to make it clarify that these are more about "ref". Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@ -432,7 +432,7 @@ static int add_worktree(const char *path, const char *refname,
|
||||
worktrees = NULL;
|
||||
|
||||
/* is 'refname' a branch or commit? */
|
||||
if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
|
||||
if (!opts->detach && !check_branch_ref(&symref, refname) &&
|
||||
refs_ref_exists(get_main_ref_store(the_repository), symref.buf)) {
|
||||
is_branch = 1;
|
||||
if (!opts->force)
|
||||
@ -604,7 +604,7 @@ static void print_preparing_worktree_line(int detach,
|
||||
fprintf_ln(stderr, _("Preparing worktree (new branch '%s')"), new_branch);
|
||||
} else {
|
||||
struct strbuf s = STRBUF_INIT;
|
||||
if (!detach && !strbuf_check_branch_ref(&s, branch) &&
|
||||
if (!detach && !check_branch_ref(&s, branch) &&
|
||||
refs_ref_exists(get_main_ref_store(the_repository), s.buf))
|
||||
fprintf_ln(stderr, _("Preparing worktree (checking out '%s')"),
|
||||
branch);
|
||||
@ -745,7 +745,7 @@ static char *dwim_branch(const char *path, char **new_branch)
|
||||
char *branchname = xstrndup(s, n);
|
||||
struct strbuf ref = STRBUF_INIT;
|
||||
|
||||
branch_exists = !strbuf_check_branch_ref(&ref, branchname) &&
|
||||
branch_exists = !check_branch_ref(&ref, branchname) &&
|
||||
refs_ref_exists(get_main_ref_store(the_repository),
|
||||
ref.buf);
|
||||
strbuf_release(&ref);
|
||||
@ -838,7 +838,7 @@ static int add(int ac, const char **av, const char *prefix)
|
||||
new_branch = new_branch_force;
|
||||
|
||||
if (!opts.force &&
|
||||
!strbuf_check_branch_ref(&symref, new_branch) &&
|
||||
!check_branch_ref(&symref, new_branch) &&
|
||||
refs_ref_exists(get_main_ref_store(the_repository), symref.buf))
|
||||
die_if_checked_out(symref.buf, 0);
|
||||
strbuf_release(&symref);
|
||||
|
Reference in New Issue
Block a user