From 6bab74e7fb89b7427e5ef24b48a07fe9450c40e7 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sat, 6 Nov 2010 06:46:52 -0500 Subject: [PATCH] strbuf: move strbuf_branchname to sha1_name.c strbuf_branchname is a thin wrapper around interpret_branch_name from sha1_name.o. Most strbuf.o users do not need it. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- sha1_name.c | 18 ++++++++++++++++++ strbuf.c | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sha1_name.c b/sha1_name.c index 484081de82..32522c0fe5 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -934,6 +934,24 @@ int interpret_branch_name(const char *name, struct strbuf *buf) return len; } +int strbuf_branchname(struct strbuf *sb, const char *name) +{ + int len = strlen(name); + if (interpret_branch_name(name, sb) == len) + return 0; + strbuf_add(sb, name, len); + return len; +} + +int strbuf_check_branch_ref(struct strbuf *sb, const char *name) +{ + strbuf_branchname(sb, name); + if (name[0] == '-') + return CHECK_REF_FORMAT_ERROR; + strbuf_splice(sb, 0, 0, "refs/heads/", 11); + return check_ref_format(sb->buf); +} + /* * This is like "get_sha1_basic()", except it allows "sha1 expressions", * notably "xyz^" for "parent of xyz" diff --git a/strbuf.c b/strbuf.c index 65b4cf4343..9b3c4457f2 100644 --- a/strbuf.c +++ b/strbuf.c @@ -386,21 +386,3 @@ int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint) return len; } - -int strbuf_branchname(struct strbuf *sb, const char *name) -{ - int len = strlen(name); - if (interpret_branch_name(name, sb) == len) - return 0; - strbuf_add(sb, name, len); - return len; -} - -int strbuf_check_branch_ref(struct strbuf *sb, const char *name) -{ - strbuf_branchname(sb, name); - if (name[0] == '-') - return CHECK_REF_FORMAT_ERROR; - strbuf_splice(sb, 0, 0, "refs/heads/", 11); - return check_ref_format(sb->buf); -} -- 2.11.4.GIT