Skip to content

Commit

Permalink
Inline function refname_format_print()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed Oct 5, 2011
1 parent 7f748c7 commit a5e4ec0
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions builtin/check-ref-format.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}

0 comments on commit a5e4ec0

Please sign in to comment.