diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-06 00:43:44 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-06 00:43:44 -0700 |
commit | fbdc05661d9b732d06c47ccb3d5836d0d1b563e5 (patch) | |
tree | b5e7e00ca449758d6244a382a27e9b967286787a /branch.c | |
parent | Merge branch 'jc/shared-literally' (diff) | |
parent | Don't permit ref/branch names to end with ".lock" (diff) | |
download | tgif-fbdc05661d9b732d06c47ccb3d5836d0d1b563e5.tar.xz |
Merge branch 'jc/name-branch'
* jc/name-branch:
Don't permit ref/branch names to end with ".lock"
check_ref_format(): tighten refname rules
strbuf_check_branch_ref(): a helper to check a refname for a branch
Fix branch -m @{-1} newname
check-ref-format --branch: give Porcelain a way to grok branch shorthand
strbuf_branchname(): a wrapper for branch name shorthands
Rename interpret/substitute nth_last_branch functions
Conflicts:
Documentation/git-check-ref-format.txt
Diffstat (limited to 'branch.c')
-rw-r--r-- | branch.c | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -134,16 +134,8 @@ void create_branch(const char *head, char *real_ref, msg[PATH_MAX + 20]; struct strbuf ref = STRBUF_INIT; int forcing = 0; - int len; - len = strlen(name); - if (interpret_nth_last_branch(name, &ref) != len) { - strbuf_reset(&ref); - strbuf_add(&ref, name, len); - } - strbuf_splice(&ref, 0, 0, "refs/heads/", 11); - - if (check_ref_format(ref.buf)) + if (strbuf_check_branch_ref(&ref, name)) die("'%s' is not a valid branch name.", name); if (resolve_ref(ref.buf, sha1, 1, NULL)) { |