List for cgit developers and users
 help / color / mirror / Atom feed
From: john at keeping.me.uk (John Keeping)
Subject: [PATCH] Fix processing of repo.hide and repo.ignore
Date: Mon, 10 Aug 2015 09:31:15 +0100	[thread overview]
Message-ID: <20150810083115.GF30507@serenity.lan> (raw)
In-Reply-To: <55C856AC.50306@nachtgeist.net>

On Mon, Aug 10, 2015 at 09:45:48AM +0200, Daniel Reichelt wrote:
> 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 at nachtgeist.net>

Reviewed-by: John Keeping <john at keeping.me.uk>

> ---
>  cgit.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/cgit.c b/cgit.c
> index ae413c6..8c9cfb5 100644
> --- 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);
>  	}
>  }
>  
> -- 
> 2.1.4


  reply	other threads:[~2015-08-10  8:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-10  7:45 hacking
2015-08-10  8:31 ` john [this message]
2015-08-12 12:08   ` Jason
  -- strict thread matches above, loose matches on Subject: below --
2015-08-07  5:09 hacking
2015-08-07  8:14 ` john
2015-08-10  7:45   ` hacking

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150810083115.GF30507@serenity.lan \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).