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>
This commit is contained in:

committed by
Junio C Hamano

parent
7f748c7cb2
commit
a5e4ec063a
@ -48,17 +48,12 @@ static int check_ref_format_branch(const char *arg)
|
|||||||
return 0;
|
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 cmd_check_ref_format(int argc, const char **argv, const char *prefix)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int print = 0;
|
int print = 0;
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
|
const char *refname;
|
||||||
|
|
||||||
if (argc == 2 && !strcmp(argv[1], "-h"))
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
||||||
usage(builtin_check_ref_format_usage);
|
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))
|
if (! (i == argc - 1))
|
||||||
usage(builtin_check_ref_format_usage);
|
usage(builtin_check_ref_format_usage);
|
||||||
|
|
||||||
if (check_refname_format(argv[i], flags))
|
refname = argv[i];
|
||||||
|
if (check_refname_format(refname, flags))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (print)
|
if (print) {
|
||||||
refname_format_print(argv[i]);
|
refname = collapse_slashes(refname);
|
||||||
|
printf("%s\n", refname);
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user