test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier

diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index f5df9aad709defbd4c26fa1f9bbe6b1375457fdb..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>";
 
 /*
@@ -51,7 +51,7 @@ static int check_ref_format_branch(const char *arg)
 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;
 
@@ -62,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"))
@@ -77,13 +77,12 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
                usage(builtin_check_ref_format_usage);
 
        refname = argv[i];
+       if (normalize)
+               refname = collapse_slashes(refname);
        if (check_refname_format(refname, flags))
                return 1;
-
-       if (print) {
-               refname = collapse_slashes(refname);
+       if (normalize)
                printf("%s\n", refname);
-       }
 
        return 0;
 }