git check-ref-format: add options --allow-onelevel and --refspec-pattern

[thirdparty/git.git] / builtin / check-ref-format.c

diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index ae3f28115a7a4d65d8bb6f284cd1ececa4f9c2ef..72959547b31ccf0239a146b91a06d92332b901f6 100644 (file)
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -8,12 +8,12 @@
 #include "strbuf.h"
 
 static const char builtin_check_ref_format_usage[] =
-"git check-ref-format [--print] <refname>\n"
+"git check-ref-format [--print] [options] <refname>\n"
 "   or: git check-ref-format --branch <branchname-shorthand>";
 
 /*
- * Replace each run of adjacent slashes in src with a single slash,
- * and write the result to dst.
+ * Remove leading slashes and replace each run of adjacent slashes in
+ * src with a single slash, and write the result to dst.
  *
  * This function is similar to normalize_path_copy(), but stripped down
  * to meet check_ref_format's simpler needs.
@@ -21,7 +21,7 @@ static const char builtin_check_ref_format_usage[] =
 static void collapse_slashes(char *dst, const char *src)
 {
        char ch;
-       char prev = '\0';
+       char prev = '/';
 
        while ((ch = *src++) != '\0') {
                if (prev == '/' && ch == prev)
@@ -45,27 +45,65 @@ static int check_ref_format_branch(const char *arg)
        return 0;
 }
 
-static int check_ref_format_print(const char *arg)
+static void refname_format_print(const char *arg)
 {
        char *refname = xmalloc(strlen(arg) + 1);
 
-       if (check_ref_format(arg))
-               return 1;
        collapse_slashes(refname, arg);
        printf("%s\n", refname);
-       return 0;
 }
 
+#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;
+       int print = 0;
+       int flags = 0;
+
        if (argc == 2 && !strcmp(argv[1], "-h"))
                usage(builtin_check_ref_format_usage);
 
        if (argc == 3 && !strcmp(argv[1], "--branch"))
                return check_ref_format_branch(argv[2]);
-       if (argc == 3 && !strcmp(argv[1], "--print"))
-               return check_ref_format_print(argv[2]);
-       if (argc != 2)
+
+       for (i = 1; i < argc && argv[i][0] == '-'; i++) {
+               if (!strcmp(argv[i], "--print"))
+                       print = 1;
+               else if (!strcmp(argv[i], "--allow-onelevel"))
+                       flags |= REFNAME_ALLOW_ONELEVEL;
+               else if (!strcmp(argv[i], "--no-allow-onelevel"))
+                       flags &= ~REFNAME_ALLOW_ONELEVEL;
+               else if (!strcmp(argv[i], "--refspec-pattern"))
+                       flags |= REFNAME_REFSPEC_PATTERN;
+               else
+                       usage(builtin_check_ref_format_usage);
+       }
+       if (! (i == argc - 1))
                usage(builtin_check_ref_format_usage);
-       return !!check_ref_format(argv[1]);
+
+       switch (check_ref_format(argv[i])) {
+       case CHECK_REF_FORMAT_OK:
+               break;
+       case CHECK_REF_FORMAT_ERROR:
+               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]);
+
+       return 0;
 }