X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/6821d8ea4a64d15b8f284d1af01ab184ef1e76c3..682adbc0cad2baa1a6119013b166f52de3ee3352:/ui-log.c

diff --git a/ui-log.c b/ui-log.c
index ee93653..b9771fa 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -101,7 +101,7 @@ void print_commit(struct commit *commit)
 		files = 0;
 		add_lines = 0;
 		rem_lines = 0;
-		cgit_diff_commit(commit, inspect_files);
+		cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
 		html("</td><td>");
 		htmlf("%d", files);
 		if (ctx.repo->enable_log_linecount) {
@@ -111,6 +111,9 @@ void print_commit(struct commit *commit)
 	}
 	html("</td></tr>\n");
 	if (ctx.qry.showmsg) {
+		struct strbuf notes = STRBUF_INIT;
+		format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);
+
 		if (ctx.repo->enable_log_filecount) {
 			cols++;
 			if (ctx.repo->enable_log_linecount)
@@ -120,6 +123,15 @@ void print_commit(struct commit *commit)
 			cols);
 		html_txt(info->msg);
 		html("</td></tr>\n");
+		if (notes.len != 0) {
+			html("<tr class='nohover'>");
+			html("<td class='lognotes-label'>Notes:</td>");
+			htmlf("<td colspan='%d' class='lognotes'>",
+				cols);
+			html_txt(notes.buf);
+			html("</td></tr>\n");
+		}
+		strbuf_release(&notes);
 	}
 	cgit_free_commitinfo(info);
 }
@@ -150,7 +162,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 
 	argv[1] = disambiguate_ref(tip);
 
-	if (grep && pattern) {
+	if (grep && pattern && *pattern) {
 		if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
 		    !strcmp(grep, "committer"))
 			argv[argc++] = fmt("--%s=%s", grep, pattern);
@@ -216,8 +228,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		commit->parents = NULL;
 	}
 	if (pager) {
-		htmlf("</table><div class='pager'>",
-		     columns);
+		html("</table><div class='pager'>");
 		if (ofs > 0) {
 			cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
 				      ctx.qry.sha1, ctx.qry.vpath,