|
diff --git a/ui-refs.c b/ui-refs.c index d3b4f6e..6571cc4 100644 --- a/ ui-refs.c+++ b/ ui-refs.c |
|
@@ -39,29 +39,31 @@ static int cmp_branch_age(const void *a, const void *b) |
39 | struct refinfo *r1 = *(struct refinfo **)a; |
39 | struct refinfo *r1 = *(struct refinfo **)a; |
40 | struct refinfo *r2 = *(struct refinfo **)b; |
40 | struct refinfo *r2 = *(struct refinfo **)b; |
41 | |
41 | |
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 | |
| |
45 | static 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 | |
45 | static int cmp_tag_age(const void *a, const void *b) |
58 | static 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 | |
64 | static int print_branch(struct refinfo *ref) |
66 | static int print_branch(struct refinfo *ref) |
65 | { |
67 | { |
66 | struct commitinfo *info = ref->commit; |
68 | struct commitinfo *info = ref->commit; |
67 | char *name = (char *)ref->refname; |
69 | char *name = (char *)ref->refname; |
|