check-ref-format --branch: give Porcelain a way to grok branch shorthand

diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c
index 701de439ae0f508f3a8ab41559230357be60637e..39db6cbe47d77f84bd2d1d8d98942be89aaa1bf7 100644 (file)
--- a/builtin-check-ref-format.c
+++ b/builtin-check-ref-format.c
@@ -5,9 +5,19 @@
 #include "cache.h"
 #include "refs.h"
 #include "builtin.h"
+#include "strbuf.h"
 
 int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
 {
+       if (argc == 3 && !strcmp(argv[1], "--branch")) {
+               struct strbuf sb = STRBUF_INIT;
+               strbuf_branchname(&sb, argv[2]);
+               strbuf_splice(&sb, 0, 0, "refs/heads/", 11);
+               if (check_ref_format(sb.buf))
+                       die("'%s' is not a valid branch name", argv[2]);
+               printf("%s\n", sb.buf + 11);
+               exit(0);
+       }
        if (argc != 2)
                usage("git check-ref-format refname");
        return !!check_ref_format(argv[1]);