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
This commit is contained in:
Shawn O. Pearce
2007-10-20 20:43:36 -04:00
3 changed files with 6 additions and 3 deletions

View File

@ -120,7 +120,7 @@ method _read {fd after} {
} else {
$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
}