Merge branch 'maint'

* maint:
git-gui: Don't display CR within console windows
git-gui: Handle progress bars from newer gits
git-gui: Correctly report failures from git-write-tree

Conflicts:

lib/commit.tcl
lib/console.tcl

diff --cc lib/commit.tcl
index 7099f5c6f79a72e75b83cfdc7432249476c492cb,57238129e420a313c34e2a99b9f9bdb87ecce39d..10b0430f54863111268a4b67364cbc678b0eb50d
--- 1/lib/commit.tcl
--- 2/lib/commit.tcl
+++ b/lib/commit.tcl
@@@ -253,8 -253,8 +253,8 @@@ proc commit_committree {fd_wt curHEAD m
        global repo_config
  
        gets $fd_wt tree_id
-       if {$tree_id eq {} || [catch {close $fd_wt} err]} {
+       if {[catch {close $fd_wt} err]} {
 -              error_popup "write-tree failed:\n\n$err"
 +              error_popup [strcat [mc "write-tree failed:"] "\n\n$err"]
                ui_status {Commit failed.}
                unlock_index
                return

diff --cc lib/console.tcl
index 2075374683a49dd8a955e52c76d951ec3013536b,b038a783581d4fcc92b030669b8a8fb3c09a623e..5597188d803a1c8217011412a39c14fbbeaf0b3a
--- 1/lib/console.tcl
--- 2/lib/console.tcl
+++ b/lib/console.tcl
@@@ -118,9 -120,9 +118,9 @@@ method _read {fd after} 
                                set c $lf
                                incr c
                        } else {
 -                              $w.m.t delete $console_cr end
 -                              $w.m.t insert end "\n"
 -                              $w.m.t insert end [string range $buf $c [expr {$cr - 1}]]
 +                              $w_t delete $console_cr end
 +                              $w_t insert end "\n"
-                               $w_t insert end [string range $buf $c $cr]
++                              $w_t insert end [string range $buf $c [expr {$cr - 1}]]
                                set c $cr
                                incr c
                        }

diff --cc lib/status_bar.tcl
Simple merge