Skip to content

Commit

Permalink
gitweb: Move check-ref-format code into separate function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Krzesimir Nowak authored and Junio C Hamano committed Dec 12, 2013
1 parent a155a5f commit c0bc226
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions gitweb/gitweb.perl
Original file line number Diff line number Diff line change
Expand Up @@ -1452,6 +1452,16 @@ sub validate_pathname {
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 {
my $input = shift || return undef;

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

Expand Down

0 comments on commit c0bc226

Please sign in to comment.