author | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:34:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-08 18:34:30 (UTC) |
commit | 4e75d7c9b93010663963d362099777b77a67c446 (patch) (unidiff) | |
tree | b36c95b774e31bd4bb3bcde0123d6522719b7a5a /ui-refs.c | |
parent | f4f6210b4f9c214dc247567bbd06b1135c9ecd06 (diff) | |
parent | 41934a3222cd3e5a5f214e4275929519c70d311d (diff) | |
download | cgit-4e75d7c9b93010663963d362099777b77a67c446.zip cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.gz cgit-4e75d7c9b93010663963d362099777b77a67c446.tar.bz2 |
Merge branch 'lh/remote-branches'
-rw-r--r-- | ui-refs.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -182,16 +182,18 @@ void cgit_print_branches(int maxcount) | |||
182 | html("<tr class='nohover'><th class='left'>Branch</th>" | 182 | html("<tr class='nohover'><th class='left'>Branch</th>" |
183 | "<th class='left'>Commit message</th>" | 183 | "<th class='left'>Commit message</th>" |
184 | "<th class='left'>Author</th>" | 184 | "<th class='left'>Author</th>" |
185 | "<th class='left' colspan='2'>Age</th></tr>\n"); | 185 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
186 | 186 | ||
187 | list.refs = NULL; | 187 | list.refs = NULL; |
188 | list.alloc = list.count = 0; | 188 | list.alloc = list.count = 0; |
189 | for_each_branch_ref(cgit_refs_cb, &list); | 189 | for_each_branch_ref(cgit_refs_cb, &list); |
190 | if (ctx.repo->enable_remote_branches) | ||
191 | for_each_remote_ref(cgit_refs_cb, &list); | ||
190 | 192 | ||
191 | if (maxcount == 0 || maxcount > list.count) | 193 | if (maxcount == 0 || maxcount > list.count) |
192 | maxcount = list.count; | 194 | maxcount = list.count; |
193 | 195 | ||
194 | if (maxcount < list.count) { | 196 | if (maxcount < list.count) { |
195 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); | 197 | qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age); |
196 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); | 198 | qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name); |
197 | } | 199 | } |