summaryrefslogtreecommitdiff
path: root/builtin-check-ref-format.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-21 14:35:51 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-22 23:52:11 -0700
commita2fab531bbb00ff64335906e22854365be2eb5c7 (patch)
tree3ae5efaa819454c41ece9566e0b38df7fadebd94 /builtin-check-ref-format.c
parent03d3aada5a2a68a7acdb6286fd72155f01626e41 (diff)
downloadgit-a2fab531bbb00ff64335906e22854365be2eb5c7.tar.gz
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 <gitster@pobox.com>
Diffstat (limited to 'builtin-check-ref-format.c')
-rw-r--r--builtin-check-ref-format.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c
index 39db6cbe47..f9381e07ea 100644
--- a/builtin-check-ref-format.c
+++ b/builtin-check-ref-format.c
@@ -11,9 +11,8 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
{
if (argc == 3 && !strcmp(argv[1], "--branch")) {
struct strbuf sb = STRBUF_INIT;
- strbuf_branchname(&sb, argv[2]);
- strbuf_splice(&sb, 0, 0, "refs/heads/", 11);
- if (check_ref_format(sb.buf))
+
+ if (strbuf_check_branch_ref(&sb, argv[2]))
die("'%s' is not a valid branch name", argv[2]);
printf("%s\n", sb.buf + 11);
exit(0);