Merge branch 'sp/smart-http-failure-to-push'

diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index 989ee5cc023d55ee42aa2d1a316032f494a836bf..28a7320271a9555356170bfdb06ffb4b07bc9b92 100644 (file)
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -8,7 +8,7 @@
 #include "strbuf.h"
 
 static const char builtin_check_ref_format_usage[] =
-"git check-ref-format [--print] [options] <refname>\n"
+"git check-ref-format [--normalize] [options] <refname>\n"
 "   or: git check-ref-format --branch <branchname-shorthand>";
 
 /*
@@ -48,17 +48,12 @@ static int check_ref_format_branch(const char *arg)
        return 0;
 }
 
-static void refname_format_print(const char *arg)
-{
-       char *refname = collapse_slashes(arg);
-       printf("%s\n", refname);
-}
-
 int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
 {
        int i;
-       int print = 0;
+       int normalize = 0;
        int flags = 0;
+       const char *refname;
 
        if (argc == 2 && !strcmp(argv[1], "-h"))
                usage(builtin_check_ref_format_usage);
@@ -67,8 +62,8 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
                return check_ref_format_branch(argv[2]);
 
        for (i = 1; i < argc && argv[i][0] == '-'; i++) {
-               if (!strcmp(argv[i], "--print"))
-                       print = 1;
+               if (!strcmp(argv[i], "--normalize") || !strcmp(argv[i], "--print"))
+                       normalize = 1;
                else if (!strcmp(argv[i], "--allow-onelevel"))
                        flags |= REFNAME_ALLOW_ONELEVEL;
                else if (!strcmp(argv[i], "--no-allow-onelevel"))
@@ -81,11 +76,13 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
        if (! (i == argc - 1))
                usage(builtin_check_ref_format_usage);
 
-       if (check_refname_format(argv[i], flags))
+       refname = argv[i];
+       if (normalize)
+               refname = collapse_slashes(refname);
+       if (check_refname_format(refname, flags))
                return 1;
-
-       if (print)
-               refname_format_print(argv[i]);
+       if (normalize)
+               printf("%s\n", refname);
 
        return 0;
 }