aboutsummaryrefslogtreecommitdiffstats
path: root/ui-log.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2012-01-03 17:06:58 +0100
committerLars Hjemli <hjemli@gmail.com>2012-01-03 17:06:58 +0100
commit04254fa903701943bd45a479a952cc213a5b112a (patch)
tree5ae865f0cae8505cb54d3360baa256fc684e3bbc /ui-log.c
parentd96d2c98ebc4c2d3765f5b35c4142e0e828a421b (diff)
parentf2ced535e9f2c2ada7f184735a07a1190a9d810f (diff)
downloadcgit-04254fa903701943bd45a479a952cc213a5b112a.tar.gz
cgit-04254fa903701943bd45a479a952cc213a5b112a.tar.xz
Merge branch 'stable'
Diffstat (limited to 'ui-log.c')
-rw-r--r--ui-log.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui-log.c b/ui-log.c
index 4a295bd..6b12ca2 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;
}
}