summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2010-08-03 20:52:11 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-08-03 20:52:11 (UTC)
commit6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12 (patch) (side-by-side diff)
tree2f184829fba36a0218c9403fa91e5246387b3e0b
parentf9143171267e39f66a02ad2ecb0da2e8cc7f4142 (diff)
parent15c64c5e474bfaa7fd68c588a13d20deefe1c59d (diff)
downloadcgit-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.zip
cgit-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.tar.gz
cgit-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--ui-refs.c26
2 files changed, 15 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 8b426fe..3e5a38d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,2 @@
-CGIT_VERSION = v0.8.3.2
+CGIT_VERSION = v0.8.3.3
CGIT_SCRIPT_NAME = cgit.cgi
diff --git a/ui-refs.c b/ui-refs.c
index 94ff6be..caddfbc 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -44,2 +44,15 @@ static int cmp_branch_age(const void *a, const void *b)
+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)
@@ -48,15 +61,4 @@ static int cmp_tag_age(const void *a, const void *b)
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));
}