]> granicus.if.org Git - cgit/commitdiff
Fix processing of repo.hide and repo.ignore
authorDaniel Reichelt <hacking@nachtgeist.net>
Mon, 10 Aug 2015 07:45:48 +0000 (09:45 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Wed, 12 Aug 2015 12:08:15 +0000 (14:08 +0200)
If the global option enable-filter-overrides is set to 1 the repo-specific
options repo.hide and repo.ignore never got processed.

Signed-off-by: Daniel Reichelt <hacking@nachtgeist.net>
Reviewed-by: John Keeping <john@keeping.me.uk>
cgit.c

diff --git a/cgit.c b/cgit.c
index ae413c629e96c7c4f98070796dc2ac3c4250b551..8c9cfb5e87ad9343f21b6cc0b032575969e4b914 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -82,6 +82,10 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->logo = xstrdup(value);
        else if (!strcmp(name, "logo-link") && value != NULL)
                repo->logo_link = xstrdup(value);
+       else if (!strcmp(name, "hide"))
+               repo->hide = atoi(value);
+       else if (!strcmp(name, "ignore"))
+               repo->ignore = atoi(value);
        else if (ctx.cfg.enable_filter_overrides) {
                if (!strcmp(name, "about-filter"))
                        repo->about_filter = cgit_new_filter(value, ABOUT);
@@ -93,10 +97,6 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                        repo->email_filter = cgit_new_filter(value, EMAIL);
                else if (!strcmp(name, "owner-filter"))
                        repo->owner_filter = cgit_new_filter(value, OWNER);
-       } else if (!strcmp(name, "hide")) {
-               repo->hide = atoi(value);
-       } else if (!strcmp(name, "ignore")) {
-               repo->ignore = atoi(value);
        }
 }