diff options
| author | Lars Hjemli | 2010-08-03 22:52:11 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2010-08-03 22:52:11 +0200 |
| commit | 6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12 (patch) | |
| tree | 2f184829fba36a0218c9403fa91e5246387b3e0b /ui-refs.c | |
| parent | f9143171267e39f66a02ad2ecb0da2e8cc7f4142 (diff) | |
| parent | 15c64c5e474bfaa7fd68c588a13d20deefe1c59d (diff) | |
| download | cgit-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.tar cgit-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.tar.gz cgit-6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12.zip | |
Merge branch 'stable'
Diffstat (limited to 'ui-refs.c')
| -rw-r--r-- | ui-refs.c | 26 |
1 files changed, 14 insertions, 12 deletions
@@ -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) |