Thanks for all the "sending patches" input; it's useful, even if my
patch isn't ;)
I suppose I was trying to provide more defaults to work around some
weirdly setup servers that I have inherited. Upon reconsideration, I'll
withdraw the patch.
Thanks for your time, and thanks for your nitpicks.
_James
-----Original Message-----
> First, why it is needed? Why can't you just have GITWEB_CONFIG_SYSTEM
> (or GITWEB_CONFIG) environment variable visible to gitweb.cgi that
> points to existing file?
Second, is there any history behind providing this fallback only for
$GITWEB_CONFIG_SYSTEM variable, and not for $GITWEB_CONFIG? Currently
gitweb use environment variable if it exists, falling back to build-time
value (might be default), and using first of $GITWEB_CONFIG and
$GITWEB_CONFIG_SYSTEM that exists.
> PS: thanks to everyone for their patience with my first patch.
> This applied cleanly with git am, let me know if I should do anything
> else differently.
>
> gitweb/gitweb.perl | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 4efeebc..43294e1 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -605,6 +605,10 @@ sub evaluate_gitweb_config {
> } elsif (-e $GITWEB_CONFIG_SYSTEM) {
> do $GITWEB_CONFIG_SYSTEM;
> die $@ if $@;
> + # if config file from env is missing, then try the default anyways
Minor nitpick: Actually that is not default, but build-time value, which
has a default.
> + } elsif (-e "++GITWEB_CONFIG_SYSTEM++") {
> + do "++GITWEB_CONFIG_SYSTEM++";
> + die $@ if $@;
> }
> }
>
> --
> 1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html