diff options
author | Jakub Narebski <jnareb@gmail.com> | 2010-03-27 20:26:59 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-31 10:57:04 -0700 |
commit | 7a49c254cdaec6b15a6e2818e29fdb34fc6f7717 (patch) | |
tree | 7e2e1ef0a5dec7e653f2f037dcb8d5bff0f0dd16 /gitweb | |
parent | e4762865c88050745a20a62c64b4ffa542e88c3a (diff) | |
download | git-7a49c254cdaec6b15a6e2818e29fdb34fc6f7717.tar.gz |
gitweb: git_get_project_config requires only $git_dir, not also $project
Fix overeager early return in git_get_project_config, introduced in 9be3614
(gitweb: Fix project-specific feature override behavior, 2010-03-01). When
git_get_project_config is called from projects list page via
git_get_project_owner($path) etc., it is called with $git_dir defined (in
git_get_project_owner($path) etc.), but $project variable is not defined.
git_get_project_config doesn't use $project variable anyway.
Reported-by: Tobias Heinlein <keytoaster@gentoo.org>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb')
-rwxr-xr-x | gitweb/gitweb.perl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 3d80deba01..9d4c58238e 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2209,8 +2209,7 @@ sub config_to_multi { sub git_get_project_config { my ($key, $type) = @_; - # do we have project - return unless (defined $project && defined $git_dir); + return unless defined $git_dir; # key sanity check return unless ($key); |