When comparing commit messages, we need to keep in mind that they are
indented by four spaces. That is, empty lines are no longer empty, but
have "trailing whitespace". When displaying them in color, that results
in those nagging red lines.

Let's just right-trim the lines in the commit message, it's not like
trailing white-space in the commit messages are important enough to care
about in branch-diff.

Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
 builtin/branch-diff.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c
index 3b565a37492..9dc581087bb 100644
--- a/builtin/branch-diff.c
+++ b/builtin/branch-diff.c
@@ -102,6 +102,7 @@ static int read_patches(const char *range, struct 
string_list *list)
                                strbuf_addbuf(&buf, &line);
                                strbuf_addstr(&buf, "\n\n");
                        } else if (starts_with(line.buf, "    ")) {
+                               strbuf_rtrim(&line);
                                strbuf_addbuf(&buf, &line);
                                strbuf_addch(&buf, '\n');
                        }
-- 
2.17.0.395.g6a618d6010f.dirty


Reply via email to