diff options
author | Bert Wesarg <bert.wesarg@googlemail.com> | 2009-11-27 07:55:18 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-28 10:05:44 -0800 |
commit | 89cb73a19ac94d15babf77af490fa5db78908234 (patch) | |
tree | a5cb2dd04e1cfe72868cb475a12bc50d02f78d8e /t/t4034-diff-words.sh | |
parent | emit_line(): don't emit an empty <SET><RESET> followed by a newline (diff) | |
download | tgif-89cb73a19ac94d15babf77af490fa5db78908234.tar.xz |
Give the hunk comment its own color
Inspired by the coloring of quilt.
Introduce a separate color and paint the hunk comment part, i.e. the name
of the function, in a separate color "diff.func" (defaults to plain).
Whitespace between hunk header and hunk comment is printed in plain color.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4034-diff-words.sh')
-rwxr-xr-x | t/t4034-diff-words.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh index 2d24fbeda6..1c21276c55 100755 --- a/t/t4034-diff-words.sh +++ b/t/t4034-diff-words.sh @@ -8,6 +8,7 @@ test_expect_success setup ' git config diff.color.old red git config diff.color.new green + git config diff.color.func magenta ' @@ -16,6 +17,7 @@ decrypt_color () { -e 's/.\[1m/<WHITE>/g' \ -e 's/.\[31m/<RED>/g' \ -e 's/.\[32m/<GREEN>/g' \ + -e 's/.\[35m/<MAGENTA>/g' \ -e 's/.\[36m/<BROWN>/g' \ -e 's/.\[m/<RESET>/g' } @@ -70,7 +72,7 @@ cat > expect <<\EOF <WHITE>+++ b/post<RESET> <BROWN>@@ -1 +1 @@<RESET> <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET> -<BROWN>@@ -3,0 +4,4 @@ a = b + c<RESET> +<BROWN>@@ -3,0 +4,4 @@<RESET> <RESET><MAGENTA>a = b + c<RESET> <GREEN>aa = a<RESET> |