all repos — cgit @ 6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12

a hyperfast web frontend for git written in c

Merge branch 'stable'
Lars Hjemli hjemli@gmail.com
Tue, 03 Aug 2010 22:52:11 +0200
commit

6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12

parent

f9143171267e39f66a02ad2ecb0da2e8cc7f4142

2 files changed, 15 insertions(+), 13 deletions(-)

jump to
M MakefileMakefile

@@ -1,4 +1,4 @@

-CGIT_VERSION = v0.8.3.2 +CGIT_VERSION = v0.8.3.3 CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
M ui-refs.cui-refs.c

@@ -42,23 +42,25 @@

return cmp_age(r1->commit->committer_date, r2->commit->committer_date); } +static int get_ref_age(struct refinfo *ref) +{ + if (!ref->object) + return 0; + switch (ref->object->type) { + case OBJ_TAG: + return ref->tag ? ref->tag->tagger_date : 0; + case OBJ_COMMIT: + return ref->commit ? ref->commit->committer_date : 0; + } + return 0; +} + static int cmp_tag_age(const void *a, const void *b) { struct refinfo *r1 = *(struct refinfo **)a; struct refinfo *r2 = *(struct refinfo **)b; - int r1date, r2date; - if (r1->object->type != OBJ_COMMIT) - r1date = r1->tag->tagger_date; - else - r1date = r1->commit->committer_date; - - if (r2->object->type != OBJ_COMMIT) - r2date = r2->tag->tagger_date; - else - r2date = r2->commit->committer_date; - - return cmp_age(r1date, r2date); + return cmp_age(get_ref_age(r1), get_ref_age(r2)); } static int print_branch(struct refinfo *ref)