git-gui: Don't display CR within console windows

Git progress bars from tools like git-push and git-fetch use CR
to skip back to the start of the current line and redraw it with
an updated progress.  We were doing this in our Tk widget but had
failed to skip the CR, which Tk doesn't draw well.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/lib/console.tcl b/lib/console.tcl
index 6f718fbac3277daed7d0d4e10c76241490c4c216..b038a783581d4fcc92b030669b8a8fb3c09a623e 100644 (file)
--- a/lib/console.tcl
+++ b/lib/console.tcl
@@ -122,7 +122,7 @@ method _read {fd after} {
                        } else {
                                $w.m.t delete $console_cr end
                                $w.m.t insert end "\n"
-                               $w.m.t insert end [string range $buf $c $cr]
+                               $w.m.t insert end [string range $buf $c [expr {$cr - 1}]]
                                set c $cr
                                incr c
                        }