From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 04 Dec 2013 20:31:49 GMT
Subject: Re: [PATCH 2/5] gitweb: Move check-ref-format code into separate function
Message-ID: <xmqqsiu8jr2i.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1386164583-14109-3-git-send-email-krzesimir@endocode.com>

Krzesimir Nowak <krzesimir@endocode.com> writes:

> This check will be used in more than one place later.
>
> Signed-off-by: Krzesimir Nowak <krzesimir@endocode.com>
> Reviewed-by: Junio C Hamano <gitster@pobox.com>

Again, I do not think I reviewed this exact version. Nor did I say
that use of the "... or return undef" is a good idea.

> Reviewed-by: Jakub Narębski <jnareb@gmail.com>
> ---
>  gitweb/gitweb.perl | 17 +++++++++++++----
>  1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index ee61f9e..67415b9 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -1452,6 +1452,16 @@ sub validate_pathname {
>  	return $input;
>  }
>  
> +sub check_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;
>  
> @@ -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
> +	check_ref_format($input)
> +		or return undef;
>  	return $input;
>  }