[PATCH] ui-log.c: do not show remote heads if enable-remote-branches=0

[Lars Hjemli]

On Tue, Oct 4, 2011 at 13:09, Georg Müller <georgmueller at gmx.net> wrote:
> If remote branches are not enabled, the branches are still listed in the log view. This patch
> removes them if enable-remote-branches=0.
>
> ---
>  ui-log.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/ui-log.c b/ui-log.c
> index 4a295bd..64f90da 100644
> --- a/ui-log.c
> +++ b/ui-log.c
> @@ -76,6 +76,10 @@ void show_commit_decorations(struct commit *commit)
>                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
>                }
>                else if (!prefixcmp(deco->name, "refs/remotes/")) {
> +                       if(!ctx.repo->enable_remote_branches) {
> +                               deco = deco->next;
> +                               continue;
> +                       }
>                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
>                        cgit_log_link(buf, NULL, "remote-deco", NULL,
>                                      sha1_to_hex(commit->object.sha1),


Your patch had corrupted whitespace, so while fixing it I also
sligthly modified it:

diff --git a/ui-log.c b/ui-log.c
index 15ed6a3..b67c2ef 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -76,6 +76,8 @@ void show_commit_decorations(struct commit *commit)
 			cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
 		}
 		else if (!prefixcmp(deco->name, "refs/remotes/")) {
+			if (!ctx.repo->enable_remote_branches)
+				goto next;
 			strncpy(buf, deco->name + 13, sizeof(buf) - 1);
 			cgit_log_link(buf, NULL, "remote-deco", NULL,
 				      sha1_to_hex(commit->object.sha1),
@@ -88,6 +90,7 @@ void show_commit_decorations(struct commit *commit)
 					 sha1_to_hex(commit->object.sha1),
 					 ctx.qry.vpath, 0);
 		}
+next:
 		deco = deco->next;
 	}
 }


Are you ok with this?

-- 
larsh