diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-17 19:31:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-17 19:31:18 -0800 |
| commit | a8f6b201aadcadeb9bfe05a66de32878bff800f7 (patch) | |
| tree | ba35e286f47a53af3b08bbb1d5546b461b4fb8f4 /gitweb/gitweb.perl | |
| parent | c84c483ffdfc45d8143fd6f6620361aba91d1080 (diff) | |
| parent | b59012ef4e7dde1895d988736c7df64f68b1e940 (diff) | |
| download | git-a8f6b201aadcadeb9bfe05a66de32878bff800f7.tar.gz git-a8f6b201aadcadeb9bfe05a66de32878bff800f7.tar.xz | |
Merge branch 'br/gitweb'
* br/gitweb:
gitweb: Use the config file to set repository owner's name.
Diffstat (limited to 'gitweb/gitweb.perl')
| -rwxr-xr-x | gitweb/gitweb.perl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 8779ca817..8008260f6 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1770,6 +1770,7 @@ sub git_get_project_owner { my $owner; return undef unless $project; + $git_dir = "$projectroot/$project"; if (!defined $gitweb_project_owner) { git_get_project_list_from_file(); @@ -1778,8 +1779,11 @@ sub git_get_project_owner { if (exists $gitweb_project_owner->{$project}) { $owner = $gitweb_project_owner->{$project}; } + if (!defined $owner){ + $owner = git_get_project_config('owner'); + } if (!defined $owner) { - $owner = get_file_owner("$projectroot/$project"); + $owner = get_file_owner("$git_dir"); } return $owner; |