mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-10 19:16:14 +02:00
Code

Merge branch 'br/gitweb' 

* br/gitweb:
  gitweb: Use the config file to set repository owner's name.
This commit is contained in:
Junio C Hamano 2008-02-17 19:31:18 -08:00
parent c84c483ffd b59012ef4e
commit a8f6b201aa
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitweb/README
View File

@ -233,6 +233,10 @@ You can use the following files in repository:
Displayed in the project summary page. You can use multiple-valued
gitweb.url repository configuration variable for that, but the file
takes precendence.
* gitweb.owner
You can use the gitweb.owner repository configuration variable to set
repository's owner. It is displayed in the project list and summary
page. If it's not set, filesystem directory's owner is used.
* various gitweb.* config variables (in config)
Read description of %feature hash for detailed list, and some
descriptions.

6
gitweb/gitweb.perl
View File

@ -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;