summaryrefslogtreecommitdiff
path: root/git-gui/lib/console.tcl
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-10-21 02:11:45 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-10-21 02:11:45 -0400
commit8a37e21dab1103e11630d091c13be21d958221c1 (patch)
tree0f6c085ec04678da3e267c8fab215359672697a1 /git-gui/lib/console.tcl
parent538dfe7397db62e5c7e8861c272380140969a8b8 (diff)
parent2ee52eb17c26323b3f62538a44510aae75f09d6f (diff)
downloadgit-8a37e21dab1103e11630d091c13be21d958221c1.tar.gz
Merge branch 'maint'
* maint: Describe more 1.5.3.5 fixes in release notes Fix diffcore-break total breakage Fix directory scanner to correctly ignore files without d_type Improve receive-pack error message about funny ref creation fast-import: Fix argument order to die in file_change_m 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 gitk.txt: Fix markup. send-pack: respect '+' on wildcard refspecs git-gui: accept versions containing text annotations, like 1.5.3.mingw.1 git-gui: Don't crash when starting gitk from a browser session git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs git-gui: Handle starting on mapped shares under Cygwin git-gui: Display message box when we cannot find git in $PATH git-gui: Avoid using bold text in entire gui for some fonts
Diffstat (limited to 'git-gui/lib/console.tcl')
-rw-r--r--git-gui/lib/console.tcl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/lib/console.tcl b/git-gui/lib/console.tcl
index 6f718fbac3..b038a78358 100644
--- a/git-gui/lib/console.tcl
+++ b/git-gui/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
}