From 2543a64187bb80078e493268e683cb0661be754f Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Fri, 17 Aug 2018 13:43:54 -0700 Subject: range-diff: indent special lines as context The range-diff coloring is a bit fuzzy when it comes to special lines of a diff, such as indicating new and old files with +++ and ---, as it would pickup the first character and interpret it for its coloring, which seems annoying as in regular diffs, these lines are colored bold via DIFF_METAINFO. By indenting these lines by a white space, they will be treated as context which is much more useful, an example [1] on the range diff series itself: [...] + diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt + new file mode 100644 + --- /dev/null + +++ b/Documentation/git-range-diff.txt +@@ ++git-range-diff(1) [...] + diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile [...] The first lines that introduce the new file for the man page will have the '+' sign colored and the rest of the line will be bold. The later lines that indicate a change to the Makefile will be treated as context both in the outer and inner diff, such that those lines stay regular color. [1] ./git-range-diff pr-1/dscho/branch-diff-v3...pr-1/dscho/branch-diff-v4 These tags are found at https://github.com/gitgitgadget/git Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- range-diff.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'range-diff.c') diff --git a/range-diff.c b/range-diff.c index a906d25f13..3e9b984401 100644 --- a/range-diff.c +++ b/range-diff.c @@ -90,6 +90,7 @@ static int read_patches(const char *range, struct string_list *list) strbuf_addch(&buf, '\n'); if (!util->diff_offset) util->diff_offset = buf.len; + strbuf_addch(&buf, ' '); strbuf_addbuf(&buf, &line); } else if (in_header) { if (starts_with(line.buf, "Author: ")) { @@ -126,6 +127,7 @@ static int read_patches(const char *range, struct string_list *list) strbuf_addch(&buf, ' '); strbuf_add(&buf, line.buf + 1, line.len - 1); } else { + strbuf_addch(&buf, ' '); strbuf_addbuf(&buf, &line); } -- cgit v1.2.3