• Stefan Beller's avatar
    range-diff: indent special lines as context · 2543a641
    Stefan Beller authored
    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/gitSigned-off-by: Stefan Beller's avatarStefan Beller <sbeller@google.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    2543a641
range-diff.c 11.6 KB