Merge branch 'jc/no-branch-name-with-dash-at-front'

gitster · gitster · commit 08986dec702f · 2010-09-29T13:49:38.000-07:00
* jc/no-branch-name-with-dash-at-front:
  disallow branch names that start with a hyphen
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`	`}`