X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/2cc8b99f083014c58d8937bfa4dcd2bc47cd7e58..6940b23b9e4698ba466a4616e4de77b986560ad3:/ui-log.c
diff --git a/ui-log.c b/ui-log.c
index 354ee08..0536b23 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -111,6 +111,9 @@ void print_commit(struct commit *commit)
}
html("\n");
if (ctx.qry.showmsg) {
+ struct strbuf notes = STRBUF_INIT;
+ format_note(NULL, commit->object.sha1, ¬es, 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("\n");
+ if (notes.len != 0) {
+ html("
");
+ html("| Notes: | ");
+ htmlf("",
+ cols);
+ html_txt(notes.buf);
+ html(" |
\n");
+ }
+ strbuf_release(¬es);
}
cgit_free_commitinfo(info);
}
@@ -150,10 +162,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
argv[1] = disambiguate_ref(tip);
- if (grep && pattern && (!strcmp(grep, "grep") ||
- !strcmp(grep, "author") ||
- !strcmp(grep, "committer")))
- argv[argc++] = fmt("--%s=%s", grep, pattern);
+ if (grep && pattern) {
+ if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
+ !strcmp(grep, "committer"))
+ argv[argc++] = fmt("--%s=%s", grep, pattern);
+ if (!strcmp(grep, "range"))
+ argv[1] = pattern;
+ }
if (path) {
argv[argc++] = "--";