summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2011-09-15 21:10:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-05 20:45:30 (GMT)
commita5e4ec063afea050d09773f0aa5dcb95a82a31ec (patch)
tree22f790eb77a8acf4fc713dfbed5a993e7187c772 /builtin
parent7f748c7cb2317800dcdb311c3e75a086ae0d1600 (diff)
downloadgit-a5e4ec063afea050d09773f0aa5dcb95a82a31ec.zip
git-a5e4ec063afea050d09773f0aa5dcb95a82a31ec.tar.gz
git-a5e4ec063afea050d09773f0aa5dcb95a82a31ec.tar.bz2
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/check-ref-format.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index 989ee5c..f5df9aa 100644
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -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;
}