Re: [PATCH 3/9] gitweb: Add option to force version match

From: Jakub Narebski <jnareb@gmail.com>
Date: Jan 24, 2010, 23:17 UTC
Message-ID: <m3iqarayar.fsf@localhost.localdomain>
In-Reply-To: <20100124215924.GA9553@machine.or.cz>

Petr Baudis <pasky@suse.cz> writes:

> On Wed, Jan 13, 2010 at 05:22:59PM -0800, John 'Warthog9' Hawley wrote:

Show 11 quoted lines

> > +# Throw an error if git versions does not match, if $git_versions_must_match is true.
> > +if ($git_versions_must_match &&
> > +    $git_version ne $version) {
> > +	my $admin_contact =
> > +		defined $ENV{'SERVER_ADMIN'} ? ", $ENV{'SERVER_ADMIN'}," : '';
> > +	my $err_msg = <<EOT;
> > +<h1 align="center">*** Warning ***</h1>
> > +<p>
> > +This version of gitweb was compiled for <b>@{[esc_html($version)]}</b>,
> > +however git version <b>@{[esc_html($git_version)]}</b> was found on server,
> > +and administrator requested strict version checking.

+and administrator requested strict version checking by setting +\$git_versions_must_match to false value (e.g. to 0) in gitweb configuration file, +'@{[esc_path(-e $GITWEB_CONFIG ? $GITWEB_CONFIG : $GITWEB_CONFIG_SYSTEM)]}'.

Show 13 quoted lines

> > +</p>
> > +<p>
> > +Please contact the server administrator${admin_contact} to either configure
> > +gitweb to allow mismatched versions, or update git or gitweb installation.
> > +</p>
> > +EOT
> > +	die_error(500, 'Internal server error', $err_msg);
> > +}
> > +
> 
>   I get very unhappy when *I* am the server administrator and read
> messages like this. ;-) Could you please mention the
> \$git_versions_must_match in the text?

Something like the text (extension) proposed above?

Actually, J.H., if you are changing the default, you should also change the message to mention that checking versions is the default, and administrator can turn it off[1]. It is incorrect if $git_versions_must_match defaults to true.

[1] And you have to take into account that gitweb config file can not exist, and neither $GITWEB_CONFIG nor $GITWEB_CONFIG_SYSTEM needs to be non-empty. J.H., are you really, really sure that it is a good idea to have version check turned on by default, in light of this issue?

-- 
Jakub Narebski
Poland
ShadeHawk on #git