diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2012-01-03 16:06:58 +0000 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2012-01-03 16:06:58 +0000 |
| commit | 04254fa903701943bd45a479a952cc213a5b112a (patch) | |
| tree | 5ae865f0cae8505cb54d3360baa256fc684e3bbc /ui-log.c | |
| parent | shared.c: Only setenv() if value is non-null (diff) | |
| parent | Fix diff mode switching when side-by-side-diffs=1 (diff) | |
| download | cgit-04254fa903701943bd45a479a952cc213a5b112a.tar.gz cgit-04254fa903701943bd45a479a952cc213a5b112a.tar.bz2 cgit-04254fa903701943bd45a479a952cc213a5b112a.zip | |
Merge branch 'stable'
Diffstat (limited to '')
| -rw-r--r-- | ui-log.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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; } } |