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/check-ref-format.c | |
| parent | 9224b73be03845a99f8171c57dc282f806b70f4c (diff) | |
| download | git-8d9c50105f908b2adde4b7c77537cf95f19cd893.tar.gz | |
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/check-ref-format.c')
| -rw-r--r-- | builtin/check-ref-format.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c index 72959547b3..8f416967af 100644 --- a/builtin/check-ref-format.c +++ b/builtin/check-ref-format.c @@ -53,9 +53,6 @@ static void refname_format_print(const char *arg) printf("%s\n", refname); } -#define REFNAME_ALLOW_ONELEVEL 1 -#define REFNAME_REFSPEC_PATTERN 2 - int cmd_check_ref_format(int argc, const char **argv, const char *prefix) { int i; @@ -83,24 +80,8 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix) if (! (i == argc - 1)) usage(builtin_check_ref_format_usage); - switch (check_ref_format(argv[i])) { - case CHECK_REF_FORMAT_OK: - break; - case CHECK_REF_FORMAT_ERROR: + if (check_refname_format(argv[i], flags)) return 1; - case CHECK_REF_FORMAT_ONELEVEL: - if (!(flags & REFNAME_ALLOW_ONELEVEL)) - return 1; - else - break; - case CHECK_REF_FORMAT_WILDCARD: - if (!(flags & REFNAME_REFSPEC_PATTERN)) - return 1; - else - break; - default: - die("internal error: unexpected value from check_ref_format()"); - } if (print) refname_format_print(argv[i]); |