crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2010-08-03 22:52:11 +02:00
commit 6a8f65bf18
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
CGIT_VERSION = v0.8.3.2 CGIT_VERSION = v0.8.3.3
CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_NAME = cgit.cgi
CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)

26
ui-refs.c
View File

@ -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); 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) static int cmp_tag_age(const void *a, const void *b)
{ {
struct refinfo *r1 = *(struct refinfo **)a; struct refinfo *r1 = *(struct refinfo **)a;
struct refinfo *r2 = *(struct refinfo **)b; struct refinfo *r2 = *(struct refinfo **)b;
int r1date, r2date;
if (r1->object->type != OBJ_COMMIT) return cmp_age(get_ref_age(r1), get_ref_age(r2));
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);
} }
static int print_branch(struct refinfo *ref) static int print_branch(struct refinfo *ref)