summaryrefslogtreecommitdiffabout
authorRobin Redeker <elmex@ta-sa.org>2009-01-10 11:44:08 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-10 11:48:39 (UTC)
commit5164be32778e2bca146e13904e5b9e79d0d6cca8 (patch) (side-by-side diff)
tree4bec149936f765df05640768701f045dedef3bc7
parent25f6a1f4c29b6a6009a185e9473317f0fe64616d (diff)
downloadcgit-5164be32778e2bca146e13904e5b9e79d0d6cca8.zip
cgit-5164be32778e2bca146e13904e5b9e79d0d6cca8.tar.gz
cgit-5164be32778e2bca146e13904e5b9e79d0d6cca8.tar.bz2
ui-refs: avoid SEGFAULT on lightweight tags
Signed-off-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-refs.c b/ui-refs.c
index d61ee7c..c35e694 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -96,97 +96,97 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
basename = cgit_repobasename(repo->url);
if (prefixcmp(ref, basename) != 0) {
if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
ref++;
if (isdigit(ref[0]))
ref = xstrdup(fmt("%s-%s", basename, ref));
}
for (f = cgit_snapshot_formats; f->suffix; f++) {
if (!(repo->snapshots & f->bit))
continue;
filename = fmt("%s%s", ref, f->suffix);
cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
html("&nbsp;&nbsp;");
}
}
static int print_tag(struct refinfo *ref)
{
struct tag *tag;
struct taginfo *info;
char *name = (char *)ref->refname;
if (ref->object->type == OBJ_TAG) {
tag = (struct tag *)ref->object;
info = ref->tag;
if (!tag || !info)
return 1;
html("<tr><td>");
cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
html("</td><td>");
if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
print_tag_downloads(ctx.repo, name);
else
cgit_object_link(tag->tagged);
html("</td><td>");
if (info->tagger)
html(info->tagger);
html("</td><td colspan='2'>");
if (info->tagger_date > 0)
cgit_print_age(info->tagger_date, -1, NULL);
html("</td></tr>\n");
} else {
if (!header)
print_tag_header();
html("<tr><td>");
html_txt(name);
html("</td><td>");
- if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
+ if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
print_tag_downloads(ctx.repo, name);
else
cgit_object_link(ref->object);
html("</td></tr>\n");
}
return 0;
}
static void print_refs_link(char *path)
{
html("<tr class='nohover'><td colspan='4'>");
cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
html("</td></tr>");
}
void cgit_print_branches(int maxcount)
{
struct reflist list;
int i;
html("<tr class='nohover'><th class='left'>Branch</th>"
"<th class='left'>Commit message</th>"
"<th class='left'>Author</th>"
"<th class='left' colspan='2'>Age</th></tr>\n");
list.refs = NULL;
list.alloc = list.count = 0;
for_each_branch_ref(cgit_refs_cb, &list);
if (maxcount == 0 || maxcount > list.count)
maxcount = list.count;
if (maxcount < list.count) {
qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
}
for(i=0; i<maxcount; i++)
print_branch(list.refs[i]);
if (maxcount < list.count)
print_refs_link("heads");
}
void cgit_print_tags(int maxcount)
{
struct reflist list;
int i;