Inline function refname_format_print()
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>
Michael Haggerty committed
Sep 15, 2011 at 23:10 UTC
a5e4ec063afea050d09773f0aa5dcb95a82a31ec
1 file changed
+7
-9
builtin/check-ref-format.c
+7
-9
@@ -48,17 +48,12 @@ static int check_ref_format_branch(const char *arg)
48
return 0;
49
}
50
51
-static void refname_format_print(const char *arg)
52
-{
53
- char *refname = collapse_slashes(arg);
54
- printf("%s\n", refname);
55
-}
56
-
51
int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
52
{
53
int i;
54
int print = 0;
55
int flags = 0;
56
+ const char *refname;
57
58
if (argc == 2 && !strcmp(argv[1], "-h"))
59
usage(builtin_check_ref_format_usage);
@@ -81,11 +76,14 @@ int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
76
if (! (i == argc - 1))
77
usage(builtin_check_ref_format_usage);
78
84
- if (check_refname_format(argv[i], flags))
79
+ refname = argv[i];
80
+ if (check_refname_format(refname, flags))
81
return 1;
82
87
- if (print)
88
- refname_format_print(argv[i]);
83
+ if (print) {
84
+ refname = collapse_slashes(refname);
85
+ printf("%s\n", refname);
86
+ }
87
88
return 0;
89
}