summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2010-03-27 19:26:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-31 17:57:04 (GMT)
commit7a49c254cdaec6b15a6e2818e29fdb34fc6f7717 (patch)
tree7e2e1ef0a5dec7e653f2f037dcb8d5bff0f0dd16 /gitweb
parente4762865c88050745a20a62c64b4ffa542e88c3a (diff)
downloadgit-7a49c254cdaec6b15a6e2818e29fdb34fc6f7717.zip
git-7a49c254cdaec6b15a6e2818e29fdb34fc6f7717.tar.gz
git-7a49c254cdaec6b15a6e2818e29fdb34fc6f7717.tar.bz2
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-xgitweb/gitweb.perl3
1 files changed, 1 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 3d80deb..9d4c582 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);