Code

Inline function refname_format_print()
authorMichael Haggerty <mhagger@alum.mit.edu>
Thu, 15 Sep 2011 21:10:29 +0000 (23:10 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2011 20:45:30 +0000 (13:45 -0700)
Soon we will make printing independent of collapsing.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/check-ref-format.c

index 989ee5cc023d55ee42aa2d1a316032f494a836bf..f5df9aad709defbd4c26fa1f9bbe6b1375457fdb 100644 (file)
@@ -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 flags = 0;
+       const char *refname;
 
        if (argc == 2 && !strcmp(argv[1], "-h"))
                usage(builtin_check_ref_format_usage);
@@ -81,11 +76,14 @@ 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 (check_refname_format(refname, flags))
                return 1;
 
-       if (print)
-               refname_format_print(argv[i]);
+       if (print) {
+               refname = collapse_slashes(refname);
+               printf("%s\n", refname);
+       }
 
        return 0;
 }