diff options
| author | Lars Hjemli | 2012-01-03 16:06:58 +0000 |
|---|---|---|
| committer | Lars Hjemli | 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.zip | |
Merge branch 'stable'
Diffstat (limited to 'ui-log.c')
| -rw-r--r-- | ui-log.c | 3 |
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) | |||
| 76 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 76 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
| 77 | } | 77 | } |
| 78 | else if (!prefixcmp(deco->name, "refs/remotes/")) { | 78 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
| 79 | if (!ctx.repo->enable_remote_branches) | ||
| 80 | goto next; | ||
| 79 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); | 81 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
| 80 | cgit_log_link(buf, NULL, "remote-deco", NULL, | 82 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
| 81 | sha1_to_hex(commit->object.sha1), | 83 | sha1_to_hex(commit->object.sha1), |
| @@ -88,6 +90,7 @@ void show_commit_decorations(struct commit *commit) | |||
| 88 | sha1_to_hex(commit->object.sha1), | 90 | sha1_to_hex(commit->object.sha1), |
| 89 | ctx.qry.vpath, 0); | 91 | ctx.qry.vpath, 0); |
| 90 | } | 92 | } |
| 93 | next: | ||
| 91 | deco = deco->next; | 94 | deco = deco->next; |
| 92 | } | 95 | } |
| 93 | } | 96 | } |