diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2011-09-15 21:10:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 20:45:29 (GMT) |
| commit | 8d9c50105f908b2adde4b7c77537cf95f19cd893 (patch) | |
| tree | 91e783b9cca8d2bac7913057b9caf28c948822e1 /builtin/replace.c | |
| parent | 9224b73be03845a99f8171c57dc282f806b70f4c (diff) | |
| download | git-8d9c50105f908b2adde4b7c77537cf95f19cd893.zip git-8d9c50105f908b2adde4b7c77537cf95f19cd893.tar.gz git-8d9c50105f908b2adde4b7c77537cf95f19cd893.tar.bz2 | |
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/replace.c')
| -rw-r--r-- | builtin/replace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index fe3a647..517fa10 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -94,7 +94,7 @@ static int replace_object(const char *object_ref, const char *replace_ref, "refs/replace/%s", sha1_to_hex(object)) > sizeof(ref) - 1) die("replace ref name too long: %.*s...", 50, ref); - if (check_ref_format(ref)) + if (check_refname_format(ref, 0)) die("'%s' is not a valid ref name.", ref); if (!resolve_ref(ref, prev, 1, NULL)) |