Skip to content

Commit e48c822

Browse files
committed
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 <[email protected]>
1 parent 182e2c4 commit e48c822

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

lib/blame.tcl

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ method _load {jump} {
470470
$w_path conf -text [escape_path $path]
471471

472472
set do_textconv 0
473-
if {![is_config_false gui.textconv] && [git-version >= 1.7.2]} {
473+
if {![is_config_false gui.textconv]} {
474474
set filter [gitattr $path diff set]
475475
set textconv [get_config [join [list diff $filter textconv] .]]
476476
if {$filter ne {set} && $textconv ne {}} {
@@ -807,9 +807,7 @@ method _read_blame {fd cur_w cur_d} {
807807
# thorough copy search; insert before the threshold
808808
set original_options [linsert $original_options 0 -C]
809809
}
810-
if {[git-version >= 1.5.3]} {
811-
lappend original_options -w ; # ignore indentation changes
812-
}
810+
lappend original_options -w ; # ignore indentation changes
813811

814812
_exec_blame $this $w_amov @amov_data \
815813
$original_options \
@@ -857,9 +855,7 @@ method _fullcopyblame {} {
857855
set threshold [get_config gui.copyblamethreshold]
858856
set original_options [list -C -C "-C$threshold"]
859857

860-
if {[git-version >= 1.5.3]} {
861-
lappend original_options -w ; # ignore indentation changes
862-
}
858+
lappend original_options -w ; # ignore indentation changes
863859

864860
# Find the line range
865861
set pos @$::cursorX,$::cursorY

0 commit comments

Comments
 (0)