path: root/git-gui/lib/diff.tcl
diff options
authorJunio C Hamano <>2007-07-30 05:53:33 (GMT)
committerJunio C Hamano <>2007-07-30 05:53:33 (GMT)
commitb8de7f764e1a9f6e8dfb587a6145906394fa607d (patch)
tree43c913e5455026cfa8d721e47663acebd01bf5df /git-gui/lib/diff.tcl
parent89b2f19cb516249b8d9546bb1f3f46a1ec5b3242 (diff)
parent84f67537b13bf0a959b1cad50b0d490071dc921a (diff)
Merge branch 'master' of git://
* 'master' of git:// (50 commits) git-gui: Minor refactoring of merge command line in merge support git-gui: Use more modern looking icons in the tree browser git-gui: Don't offer to stage hunks from untracked files git-gui: Make sure remotes are loaded when picking revisions git-gui: Use progress bar while resetting/aborting files git-gui: Honor core.excludesfile when listing extra files git-gui: Unify wording to say "to stage" instead of "to add" git-gui: Don't kill modified commit message buffer with merge templates git-gui: Remove usernames from absolute SSH urls during merging git-gui: Format tracking branch merges as though they were pulls git-gui: Cleanup bindings within merge dialog git-gui: Replace merge dialog with our revision picker widget git-gui: Show ref last update times in revision chooser tooltips git-gui: Display commit/tag/remote info in tooltip of revision picker git-gui: Save remote urls obtained from config/remotes setup git-gui: Avoid unnecessary symbolic-ref call during checkout git-gui: Refactor current branch menu items to make i18n easier git-gui: Refactor diff popup into a procedure to ease i18n work git-gui: Paper bag fix quitting crash after commit git-gui: Clarify meaning of add tracked menu option ...
Diffstat (limited to 'git-gui/lib/diff.tcl')
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 9cb9d06..e09e125 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -86,6 +86,7 @@ proc show_diff {path w {lno {}}} {
set max_sz [expr {128 * 1024}]
if {[catch {
set fd [open $path r]
+ fconfigure $fd -eofchar {}
set content [read $fd $max_sz]
close $fd
set sz [file size $path]