about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2010-08-03 22:52:11 +0200
committerLars Hjemli2010-08-03 22:52:11 +0200
commit6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12 (patch)
tree2f184829fba36a0218c9403fa91e5246387b3e0b
parentcommit-links.sh: Seperate the expressions for filtering commit messages. (diff)
parentCGIT 0.8.3.3 (diff)
downloadcgit-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.tar.gz
cgit-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.zip
Merge branch 'stable'
-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,4 +1,4 @@
1CGIT_VERSION = v0.8.3.2 1CGIT_VERSION = v0.8.3.3
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) 4CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
diff --git a/ui-refs.c b/ui-refs.c index 94ff6be..caddfbc 100644 --- a/ui-refs.c +++ b/ui-refs.c
@@ -42,23 +42,25 @@ static int cmp_branch_age(const void *a, const void *b)
42 return cmp_age(r1->commit->committer_date, r2->commit->committer_date); 42 return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
43} 43}
44 44
45static int get_ref_age(struct refinfo *ref)
46{
47 if (!ref->object)
48 return 0;
49 switch (ref->object->type) {
50 case OBJ_TAG:
51 return ref->tag ? ref->tag->tagger_date : 0;
52 case OBJ_COMMIT:
53 return ref->commit ? ref->commit->committer_date : 0;
54 }
55 return 0;
56}
57
45static int cmp_tag_age(const void *a, const void *b) 58static int cmp_tag_age(const void *a, const void *b)
46{ 59{
47 struct refinfo *r1 = *(struct refinfo **)a; 60 struct refinfo *r1 = *(struct refinfo **)a;
48 struct refinfo *r2 = *(struct refinfo **)b; 61 struct refinfo *r2 = *(struct refinfo **)b;
49 int r1date, r2date;
50
51 if (r1->object->type != OBJ_COMMIT)
52 r1date = r1->tag->tagger_date;
53 else
54 r1date = r1->commit->committer_date;
55
56 if (r2->object->type != OBJ_COMMIT)
57 r2date = r2->tag->tagger_date;
58 else
59 r2date = r2->commit->committer_date;
60 62
61 return cmp_age(r1date, r2date); 63 return cmp_age(get_ref_age(r1), get_ref_age(r2));
62} 64}
63 65
64static int print_branch(struct refinfo *ref) 66static int print_branch(struct refinfo *ref)