diff options
| author | Clément Poulain <clement.poulain@ensimag.imag.fr> | 2010-07-30 09:11:02 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2010-07-30 10:05:27 +0100 |
| commit | 1fbaccad4dd8d6a9a893843c73f3e47c4ba8b717 (patch) | |
| tree | 041d322979a5321834633c771414b52e618e12b9 /lib/diff.tcl | |
| parent | 85123549f005ebdfb55a5cbd738c3237aaed6eff (diff) | |
| download | git-1fbaccad4dd8d6a9a893843c73f3e47c4ba8b717.tar.gz git-1fbaccad4dd8d6a9a893843c73f3e47c4ba8b717.tar.xz | |
git-gui: use textconv filter for diff and blame
Create a checkbox "Use Textconv For Diffs and Blame" in git-gui options.
If checked and if the driver for the concerned file exists, git-gui calls diff
and blame with --textconv option
Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr>
Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'lib/diff.tcl')
| -rw-r--r-- | lib/diff.tcl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index ec8c11eeb..c62875027 100644 --- a/lib/diff.tcl +++ b/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]]} { |