summaryrefslogtreecommitdiff
path: root/range-diff.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-08-17 20:43:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-20 21:33:28 (GMT)
commit2543a64187bb80078e493268e683cb0661be754f (patch)
tree0166bf3e5e2cc4b22a6a22fad96f87c80648536f /range-diff.c
parent8d5ccb59def8c1737b3e055a5984eaaa4e881ce9 (diff)
downloadgit-2543a64187bb80078e493268e683cb0661be754f.zip
git-2543a64187bb80078e493268e683cb0661be754f.tar.gz
git-2543a64187bb80078e493268e683cb0661be754f.tar.bz2
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 <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'range-diff.c')
-rw-r--r--range-diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/range-diff.c b/range-diff.c
index a906d25..3e9b984 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);
}