From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 21 Oct 2007 00:43:36 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: gitgui-0.9.0~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9dcc7f865fb7891f4f6d068230663eb2cb586a7;p=git.git

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
---

c9dcc7f865fb7891f4f6d068230663eb2cb586a7
diff --cc lib/commit.tcl
index 7099f5c6f,57238129e..10b0430f5
--- a/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 207537468,b038a7835..5597188d8
--- a/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
  			}