gitweb: Use the config file to set repository owner's name.

Now gitweb checks if gitweb.owner exists before trying to get filesystem's
owner.

Allow to use configuration variable gitweb.owner set the repository owner,
it checks the gitweb.owner, if not set it uses filesystem directory's owner.

Useful when we don't want to maintain project list file, and all
repository directories have to have the same owner (for example when the
same SSH account is shared for all projects, using ssh_acl to control
access instead).

Signed-off-by: Bruno Ribas <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/README b/README
index 8ffca2e8378b0e73f24e40a45a106be449db331658e40c99b43dcebf13049a6d..0c7d7ea2ce25b43e8ecb5626aa47ecb8d84720a9feb75256dda97e67d14ce49f 100644 (file)
--- a/README
+++ b/README
@@ -232,6 +232,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.

diff --git a/gitweb.perl b/gitweb.perl
index 911ecd98cd59485f2d43ba8b0ad913ac4b23d440186aa0bbb1cd4d522a3b700f..5a5fb61c03422c8aabdb3ee836e2893aabbf856482e846854503a98cd39393eb 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -1760,6 +1760,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();
@@ -1768,8 +1769,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;