summaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-14 20:09:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-15 19:33:09 (GMT)
commit6348624010888bd2353e5cebdc2b5329490b0f6d (patch)
treec95e0852ac902097f720315f2ba56aedf4cde096 /strbuf.c
parent5879b6bbcaba7696e4abfa717748da166f915405 (diff)
downloadgit-6348624010888bd2353e5cebdc2b5329490b0f6d.zip
git-6348624010888bd2353e5cebdc2b5329490b0f6d.tar.gz
git-6348624010888bd2353e5cebdc2b5329490b0f6d.tar.bz2
disallow branch names that start with a hyphen
The current command line parser is overly lax in places and allows a branch whose name begins with a hyphen e.g. "-foo" to be created, but the parseopt infrastructure in general does not like to parse anything that begins with a dash as a short-hand refname. "git checkout -foo" won't work, nor will "git branch -d -foo" (even though "git branch -d -- -foo" works, it does so by mistake; we should not be taking anything but pathspecs after double-dash). All the codepaths that create a new branch ref, including the destination of "branch -m src dst", use strbuf_check_branch_ref() to validate if the given name is suitable as a branch name. Tighten it to disallow a branch that begins with a hyphen. You can still get rid of historical mistakes with $ git update-ref -d refs/heads/-foo and third-party Porcelains are free to keep using update-ref to create refs with a path component that begins with "-". Issue originally raised by Clemens Buchacher. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'strbuf.c')
-rw-r--r--strbuf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/strbuf.c b/strbuf.c
index bc3a080..65b4cf4 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -399,6 +399,8 @@ int strbuf_branchname(struct strbuf *sb, const char *name)
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);
}