git-gui: git-blame understands -w and textconv
git-gui uses alternate code paths for git versions < 1.7.2, avoiding use of --ignore-all-space and textconv. git-gui requires git v2.36 or later, so this alternate code is obsolete. Remove it. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Mark Levedahl committed
Feb 13, 2024 at 00:09 UTC
e48c822012a79cb98ebd1c4907c6ae3081afa4d9
1 file changed
+3
-7
lib/blame.tcl
+3
-7
@@ -470,7 +470,7 @@ method _load {jump} {
470
$w_path conf -text [escape_path $path]
471
472
set do_textconv 0
473
- if {![is_config_false gui.textconv] && [git-version >= 1.7.2]} {
473
+ if {![is_config_false gui.textconv]} {
474
set filter [gitattr $path diff set]
475
set textconv [get_config [join [list diff $filter textconv] .]]
476
if {$filter ne {set} && $textconv ne {}} {
@@ -807,9 +807,7 @@ method _read_blame {fd cur_w cur_d} {
807
# thorough copy search; insert before the threshold
808
set original_options [linsert $original_options 0 -C]
809
}
810
- if {[git-version >= 1.5.3]} {
811
- lappend original_options -w ; # ignore indentation changes
812
- }
810
+ lappend original_options -w ; # ignore indentation changes
811
812
_exec_blame $this $w_amov @amov_data \
813
$original_options \
@@ -857,9 +855,7 @@ method _fullcopyblame {} {
855
set threshold [get_config gui.copyblamethreshold]
856
set original_options [list -C -C "-C$threshold"]
857
860
- if {[git-version >= 1.5.3]} {
861
- lappend original_options -w ; # ignore indentation changes
862
- }
858
+ lappend original_options -w ; # ignore indentation changes
859
860
# Find the line range
861
set pos @$::cursorX,$::cursorY