4 files changed, 31 insertions, 6 deletions

diff --git a/cgit.c b/cgit.c
index 412fbf0..e8c1f94 100644
--- a/cgit.c
+++ b/cgit.c
@@ -68,15 +68,19 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
         else if (!strcmp(name, "max-stats"))
                 repo->max_stats = cgit_find_stats_period(value, NULL);
         else if (!strcmp(name, "module-link"))
                 repo->module_link= xstrdup(value);
         else if (!strcmp(name, "section"))
                 repo->section = xstrdup(value);
-        else if (!strcmp(name, "readme") && value != NULL) {
+        else if (!strcmp(name, "readme") && value != NULL)
                 repo->readme = xstrdup(value);
-        } else if (ctx.cfg.enable_filter_overrides) {
+        else if (!strcmp(name, "logo") && value != NULL)
+                repo->logo = xstrdup(value);
+        else if (!strcmp(name, "logo-link") && value != NULL)
+                repo->logo_link = xstrdup(value);
+        else if (ctx.cfg.enable_filter_overrides) {
                 if (!strcmp(name, "about-filter"))
                         repo->about_filter = new_filter(value, 0);
                 else if (!strcmp(name, "commit-filter"))
                         repo->commit_filter = new_filter(value, 0);
                 else if (!strcmp(name, "source-filter"))
                         repo->source_filter = new_filter(value, 1);
diff --git a/cgit.h b/cgit.h
index f5f68ac..8a9d5fa 100644
--- a/cgit.h
+++ b/cgit.h
@@ -67,12 +67,14 @@ struct cgit_repo {
         char *owner;
         char *defbranch;
         char *module_link;
         char *readme;
         char *section;
         char *clone_url;
+        char *logo;
+        char *logo_link;
         int snapshots;
         int enable_log_filecount;
         int enable_log_linecount;
         int enable_remote_branches;
         int enable_subject_links;
         int max_stats;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 8e51ca5..01157a9 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -367,12 +367,21 @@ repo.enable-remote-branches::
         in the summary and refs views. Default value: <enable-remote-branches>.
 
 repo.enable-subject-links::
         A flag which can be used to override the global setting
         `enable-subject-links'. Default value: none.
 
+repo.logo::
+        Url which specifies the source of an image which will be used as a logo
+        on this repo's pages. Default value: global logo.
+
+repo.logo-link::
+        Url loaded when clicking on the cgit logo image. If unspecified the
+        calculated url of the repository index page will be used. Default
+        value: global logo-link.
+
 repo.max-stats::
         Override the default maximum statistics period. Valid values are equal
         to the values specified for the global "max-stats" setting. Default
         value: none.
 
 repo.name::
diff --git a/ui-shared.c b/ui-shared.c
index ae29615..7efae7a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -753,23 +753,33 @@ static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
         }
         ctx->qry.path = old_path;
 }
 
 static void print_header(struct cgit_context *ctx)
 {
+        char *logo = NULL, *logo_link = NULL;
+
         html("<table id='header'>\n");
         html("<tr>\n");
 
-        if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+        if (ctx->repo && ctx->repo->logo && *ctx->repo->logo)
+                logo = ctx->repo->logo;
+        else
+                logo = ctx->cfg.logo;
+        if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link)
+                logo_link = ctx->repo->logo_link;
+        else
+                logo_link = ctx->cfg.logo_link;
+        if (logo && *logo) {
                 html("<td class='logo' rowspan='2'><a href='");
-                if (ctx->cfg.logo_link)
-                        html_attr(ctx->cfg.logo_link);
+                if (logo_link && *logo_link)
+                        html_attr(logo_link);
                 else
                         html_attr(cgit_rooturl());
                 html("'><img src='");
-                html_attr(ctx->cfg.logo);
+                html_attr(logo);
                 html("' alt='cgit logo'/></a></td>\n");
         }
 
         html("<td class='main'>");
         if (ctx->repo) {
                 cgit_index_link("index", NULL, NULL, NULL, 0);