Skip to content

diff-highlight: highlight range-diff

Jack Bates via GitGitGadget git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest1 patch 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/1diff-highlight: highlight range-diffcontrib/diff-highlight/DiffHighlight.pm+2 -11 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/1] diff-highlight: highlight range-diff

Piping git range-diff through diff-highlight currently has no effect, for two reasons:

1. There are ANSI escapes before and after the @@ hunk headers (when color is enabled) which diff-highlight fails to match. One solution is to match both escapes (/^$COLOR*\@\@$COLOR* /). This patch drops the trailing space from the existing pattern instead.

2. Unlike git log, git range-diff diffs are indented, which diff-highlight also fails to match. This patch allows hunk headers preceded by any amount of whitespace, and then skips past that indentation when parsing subsequent lines, by reusing the machinery that handles the --graph output.

Jack Bates (1):
diff-highlight: highlight range-diff

 contrib/diff-highlight/DiffHighlight.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

base-commit: 0a76bd7381ec0dbb7c43776eb6d1ac906bca29e6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-684%2Fjablko%2Fpatch-1-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-684/jablko/patch-1-v1
Pull-Request: https://github.com/git/git/pull/684

Signature · 1 line
gitgitgadget