Change check_ref_format() to take a flags argument
Change check_ref_format() to take a flags argument that indicates what is acceptable in the reference name (analogous to "git check-ref-format"'s "--allow-onelevel" and "--refspec-pattern"). This is more convenient for callers and also fixes a failure in the test suite (and likely elsewhere in the code) by enabling "onelevel" and "refspec-pattern" to be allowed independently of each other. Also rename check_ref_format() to check_refname_format() to make it obvious that it deals with refnames rather than references themselves. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
9224b73be0
commit
8d9c50105f
@ -882,7 +882,7 @@ static int parse_branchname_arg(int argc, const char **argv,
|
||||
new->name = arg;
|
||||
setup_branch_path(new);
|
||||
|
||||
if (check_ref_format(new->path) == CHECK_REF_FORMAT_OK &&
|
||||
if (!check_refname_format(new->path, 0) &&
|
||||
resolve_ref(new->path, branch_rev, 1, NULL))
|
||||
hashcpy(rev, branch_rev);
|
||||
else
|
||||
|
Reference in New Issue
Block a user