disallow branch names that start with a hyphen

gitster · gitster · commit 634862401088 · 2010-09-15T12:33:09.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,8 @@ int strbuf_branchname(struct strbuf sb, const char name)`
`399`	`399`	`int strbuf_check_branch_ref(struct strbuf sb, const char name)`
`400`	`400`	`{`
`401`	`401`	`strbuf_branchname(sb, name);`
	`402`	`+ if (name[0] == '-')`
	`403`	`+ return CHECK_REF_FORMAT_ERROR;`
`402`	`404`	`strbuf_splice(sb, 0, 0, "refs/heads/", 11);`
`403`	`405`	`return check_ref_format(sb->buf);`
`404`	`406`	`}`