diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2011-09-15 23:10:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 13:45:29 -0700 |
| commit | 8d9c50105f908b2adde4b7c77537cf95f19cd893 (patch) | |
| tree | 91e783b9cca8d2bac7913057b9caf28c948822e1 /builtin/checkout.c | |
| parent | 9224b73be03845a99f8171c57dc282f806b70f4c (diff) | |
| download | git-8d9c50105f908b2adde4b7c77537cf95f19cd893.tar.gz git-8d9c50105f908b2adde4b7c77537cf95f19cd893.tar.xz | |
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>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 3bb652591..574d2b618 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -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 |