Browse Source

Merge branch 'br/gitweb'

* br/gitweb:
  gitweb: Use the config file to set repository owner's name.
maint
Junio C Hamano 17 years ago
parent
commit
a8f6b201aa
  1. 4
      gitweb/README
  2. 6
      gitweb/gitweb.perl

4
gitweb/README

@ -233,6 +233,10 @@ You can use the following files in repository: @@ -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

@ -1770,6 +1770,7 @@ sub git_get_project_owner { @@ -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 { @@ -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;

Loading…
Cancel
Save