[PATCH 3/3] revision: make --grep search in notes too if shown
flat view
DORMANTno replies
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:54:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH 3/3] revision: make --grep search in notes too if shown · Nguyễn Thái Ngọc Duy <hidden>
- 2016-06-15 · Re: [PATCH 3/3] revision: make --grep search in notes too if shown · Junio C Hamano <hidden>
Notes are shown after commit body. From user perspective it looks pretty much like commit body and they may assume --grep would search in that part too. Make it so. Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- revision.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/revision.c b/revision.c
index 109bec1..dff6fb7 100644
--- a/revision.c
+++ b/revision.c@@ -2223,6 +2223,12 @@ static int commit_match(struct commit *commit, struct rev_info *opt) strbuf_addch(&buf, '\n'); strbuf_addstr(&buf, commit->buffer); } + if (opt->show_notes) { + if (!buf.len) + strbuf_addstr(&buf, commit->buffer); + format_display_notes(commit->object.sha1, &buf, + get_log_output_encoding(), 0); + } if (buf.len) retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len); else
--
1.7.12.1.406.g6ab07c4