From mboxrd@z Thu Jan  1 00:00:00 1970
From: john at keeping.me.uk (John Keeping)
Date: Fri, 7 Aug 2015 09:14:44 +0100
Subject: [PATCH] Fix processing of repo.hide and repo.ignore
In-Reply-To: <55C43D88.70503@nachtgeist.net>
References: <55C43D88.70503@nachtgeist.net>
Message-ID: <20150807081444.GC30507@serenity.lan>

On Fri, Aug 07, 2015 at 07:09:28AM +0200, Daniel Reichelt wrote:
> please find attached a patch which fixes processing of repo.hide and
> repo.ignore.
> These options currently get ignored, if the global option
> enable-filter-overrides is enabled.
> 
> Please CC me on replies, I'm not subscribed.
> 
> >From ebc76bf727aba915536f15a6243f301340c29a27 Mon Sep 17 00:00:00 2001
> From: Daniel Reichelt <hacking at nachtgeist.net>
> Date: Fri, 7 Aug 2015 06:21:25 +0200
> Subject: [PATCH] Fix processing of repo.hide and repo.ignore
> 
> If the global option enable-filter-overrides is set to 1 the repo-specific
> options repo.hide and repo.ignore never got processed.

Missing sign-off (see [1] for what this means).  Also please try to send
patches inline instead of as attachments; "git format-patch" will do
this.

The patch itself looks good to me.

[1] https://github.com/git/git/blob/v2.5.0/Documentation/SubmittingPatches#L234

> ---
>  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