Re: [PATCH 2/5] gitweb: Move check-ref-format code into separate function
On Wed, 2013-12-04 at 16:56 +0100, Jakub Narębski wrote:
> On Wed, Dec 4, 2013 at 2:43 PM, Krzesimir Nowak
> wrote:
>
> > This check will be used in more than one place later.
> >
> > Signed-off-by: Krzesimir Nowak
> > Reviewed-by: Junio C Hamano
> > Reviewed-by: Jakub Narębski
>
> All right, that is nice refactoring.
>
> > ---
> > 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;
> > }
>
> Right, check_ref_format() has name after git-check-ref-format...
> though... check_ref_format() or die doesn't read completely
> naturally...
>
Ok, I'll rename it to is_valid_ref_format.
--
Krzesimir Nowak
Software Developer
Endocode AG
krzesi...@endocode.com
--
Endocode AG, Johannisstraße 20, 10117 Berlin
i...@endocode.com | www.endocode.com
Vorstandsvorsitzender: Mirko Boehm
Vorstände: Dr. Karl Beecher, Chris Kühl, Sebastian Sucker
Aufsichtsratsvorsitzende: Jennifer Beecher
Registergericht: Amtsgericht Charlottenburg - HRB 150748 B
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/5] gitweb: Move check-ref-format code into separate function
On Wed, 2013-12-04 at 12:31 -0800, Junio C Hamano wrote:
> Krzesimir Nowak writes:
>
> > This check will be used in more than one place later.
> >
> > Signed-off-by: Krzesimir Nowak
> > Reviewed-by: Junio C Hamano
>
> 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.
Ok, I'll drop them. Too much fuss over those lines.
>
> > Reviewed-by: Jakub Narębski
> > ---
> > 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;
> > }
--
Krzesimir Nowak
Software Developer
Endocode AG
krzesi...@endocode.com
--
Endocode AG, Johannisstraße 20, 10117 Berlin
i...@endocode.com | www.endocode.com
Vorstandsvorsitzender: Mirko Boehm
Vorstände: Dr. Karl Beecher, Chris Kühl, Sebastian Sucker
Aufsichtsratsvorsitzende: Jennifer Beecher
Registergericht: Amtsgericht Charlottenburg - HRB 150748 B
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/5] gitweb: Move check-ref-format code into separate function
Krzesimir Nowak writes:
> This check will be used in more than one place later.
>
> Signed-off-by: Krzesimir Nowak
> Reviewed-by: Junio C Hamano
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
> ---
> 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;
> }
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/5] gitweb: Move check-ref-format code into separate function
On Wed, Dec 4, 2013 at 2:43 PM, Krzesimir Nowak wrote:
> This check will be used in more than one place later.
>
> Signed-off-by: Krzesimir Nowak
> Reviewed-by: Junio C Hamano
> Reviewed-by: Jakub Narębski
All right, that is nice refactoring.
> ---
> 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;
> }
Right, check_ref_format() has name after git-check-ref-format...
though... check_ref_format() or die doesn't read completely
naturally...
--
Jakub Narebski
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
