undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: Move check-ref-format code into separate function

Browse Source 
This check will be used in more than one place later.

Signed-off-by: Krzesimir Nowak <krzesimir@endocode.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Krzesimir Nowak 2013-12-11 12:54:41 +01:00 committed by Junio C Hamano
parent a155a5f075
commit c0bc2265ef
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gitweb/gitweb.perl
View File

@ -1452,6 +1452,16 @@ sub validate_pathname {
return $input; return $input;
} }
sub is_valid_ref_format {
my $input = shift || return undef;
# restrictions on ref name according to git-check-ref-format
if ($input =~ m!(/\.|\.\.|[\000-\040\177 ~^:?*\[]|/$)!) {
return undef;
}
return $input;
}
sub validate_refname { sub validate_refname {
my $input = shift || return undef; my $input = shift || return undef;
@ -1462,10 +1472,9 @@ sub validate_refname {
# it must be correct pathname # it must be correct pathname
$input = validate_pathname($input) $input = validate_pathname($input)
or return undef; or return undef;
# restrictions on ref name according to git-check-ref-format # check git-check-ref-format restrictions
if ($input =~ m!(/\.|\.\.|[\000-\040\177 ~^:?*\[]|/$)!) { is_valid_ref_format($input)
return undef; or return undef;
}
return $input; return $input;
} }