diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-08-03 22:52:11 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-03 22:52:11 +0200 |
| commit | 6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12 (patch) | |
| tree | 2f184829fba36a0218c9403fa91e5246387b3e0b | |
| parent | commit-links.sh: Seperate the expressions for filtering commit messages. (diff) | |
| parent | CGIT 0.8.3.3 (diff) | |
| download | cgit-pink-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.tar.gz cgit-pink-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.zip | |
Merge branch 'stable'
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ui-refs.c | 26 |
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 @@ -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) 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) 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) |