path: root/git-gui/lib/diff.tcl
diff options
authorJunio C Hamano <>2010-08-02 16:28:30 (GMT)
committerJunio C Hamano <>2010-08-02 16:28:30 (GMT)
commitc01a29c74ff991faf3012882fbf676b182b8893f (patch)
treeaea256176929d2bc66f77fde7dad2f7d7298154e /git-gui/lib/diff.tcl
parentac2e1e632e50c682305fee902b32b1a23ce71546 (diff)
parent2810a58dba6d06f4d1816fb06500c117feebd830 (diff)
Merge git:// into pt/git-gui
* git:// git-gui: fix size and position of window panes on startup git-gui: mc cannot be used before msgcat has been loaded git-gui: use textconv filter for diff and blame git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32 git-gui: fix shortcut creation on cygwin git-gui: fix PATH environment for mingw development environment git-gui: fix usage of _gitworktree when creating shortcut for windows git-gui: fix "Explore Working Copy" for Windows again git-gui: fix usage of themed widgets variable git-gui: Handle failure of core.worktree to identify the working directory. git-gui: check whether systems nice command works or disable it
Diffstat (limited to 'git-gui/lib/diff.tcl')
1 files changed, 4 insertions, 1 deletions
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index ec8c11e..c628750 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -55,7 +55,7 @@ proc handle_empty_diff {} {
set path $current_diff_path
set s $file_states($path)
- if {[lindex $s 0] ne {_M}} return
+ if {[lindex $s 0] ne {_M} || [has_textconv $path]} return
# Prevent infinite rescan loops
incr diff_empty_count
@@ -280,6 +280,9 @@ proc start_show_diff {cont_info {add_opts {}}} {
lappend cmd diff-files
+ if {![is_config_false gui.textconv] && [git-version >= 1.6.1]} {
+ lappend cmd --textconv
+ }
if {[string match {160000 *} [lindex $s 2]]
|| [string match {160000 *} [lindex $s 3]]} {