X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/fe1230dece81450004d02fa8a470f8dab8f7fdd9..1fdde95a5a169ad2240460b1d3f25bae606527f5:/ui-commit.c

diff --git a/ui-commit.c b/ui-commit.c
index 1aa5d34..a6a85a4 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -18,6 +18,7 @@ void cgit_print_commit(char *hex)
 	struct commit_list *p;
 	unsigned char sha1[20];
 	char *tmp;
+	int parents = 0;
 
 	if (!hex)
 		hex = ctx.qry.head;
@@ -39,14 +40,14 @@ void cgit_print_commit(char *hex)
 	html(" ");
 	html_txt(info->author_email);
 	html("</td><td class='right'>");
-	cgit_print_date(info->author_date, FMT_LONGDATE);
+	cgit_print_date(info->author_date, FMT_LONGDATE, ctx.cfg.local_time);
 	html("</td></tr>\n");
 	html("<tr><th>committer</th><td>");
 	html_txt(info->committer);
 	html(" ");
 	html_txt(info->committer_email);
 	html("</td><td class='right'>");
-	cgit_print_date(info->committer_date, FMT_LONGDATE);
+	cgit_print_date(info->committer_date, FMT_LONGDATE, ctx.cfg.local_time);
 	html("</td></tr>\n");
 	html("<tr><th>commit</th><td colspan='2' class='sha1'>");
 	tmp = sha1_to_hex(commit->object.sha1);
@@ -75,6 +76,7 @@ void cgit_print_commit(char *hex)
 		cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex,
 			       sha1_to_hex(p->item->object.sha1), NULL);
 		html(")</td></tr>");
+		parents++;
 	}
 	if (ctx.repo->snapshots) {
 		html("<tr><th>download</th><td colspan='2' class='sha1'>");
@@ -89,9 +91,11 @@ void cgit_print_commit(char *hex)
 	html("<div class='commit-msg'>");
 	html_txt(info->msg);
 	html("</div>");
-	if (!(commit->parents && commit->parents->next &&
-	      commit->parents->next->next)) {
-		tmp = sha1_to_hex(commit->parents->item->object.sha1);
+	if (parents < 3) {
+		if (parents)
+			tmp = sha1_to_hex(commit->parents->item->object.sha1);
+		else
+			tmp = NULL;
 		cgit_print_diff(ctx.qry.sha1, tmp, NULL);
 	}
 	cgit_free_commitinfo(info);