[PATCH] git-gui: fix ANSI-color parsing
From: Bert Wesarg <hidden>
Date: 2016-06-15 22:50:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
git diff always outputs color reset commands, even when the color for the current part is disabled (ie. normal). But the current ANSI-color parsing code assumes that color start and reset commands appear in matching pairs. Relax this assumption. Signed-off-by: Bert Wesarg <redacted> --- git-gui/lib/diff.tcl | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index dcf0711..0579fa6 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl@@ -337,12 +337,20 @@ proc parse_color_line {line} { set result "" set markup [list] set regexp {\033\[((?:\d+;)*\d+)?m} + set need_reset 0 while {[regexp -indices -start $start $regexp $line match code]} { foreach {begin end} $match break append result [string range $line $start [expr {$begin - 1}]] - lappend markup [string length $result] \ - [eval [linsert $code 0 string range $line]] + set pos [string length $result] + set col [eval [linsert $code 0 string range $line]] set start [incr end] + if {$col eq "0" || $col eq ""} { + if {!$need_reset} continue + set need_reset 0 + } else { + set need_reset 1 + } + lappend markup $pos $col } append result [string range $line $start end] if {[llength $markup] < 4} {set markup {}}
--
tg: (6f10c41..) bw/git-gui/fix-ansi-color-parsing (depends on: master)