From a840566770c262f76e8fd7fb69239fbedd10b259 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 20 Jun 2007 21:44:16 -0700 Subject: [PATCH] git-gui: use "blame -w -C -C" for "where did it come from, originally?" The blame window shows "who wrote the piece originally" and "who moved it there" in two columns. In order to identify the former more correctly, it helps to use the new -w option. [sp: Minor change to only enable -w if underlying git >= 1.5.3] Signed-off-by: Junio C Hamano Signed-off-by: Shawn O. Pearce --- lib/blame.tcl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/blame.tcl b/lib/blame.tcl index 77abd8291..dcdb11b1b 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -33,6 +33,13 @@ variable group_colors { #ececec } +# Switches for original location detection +# +variable original_options [list -C -C] +if {[git-version >= 1.5.3]} { + lappend original_options -w ; # ignore indentation changes +} + # Current blame data; cleared/reset on each load # field commit ; # input commit to blame @@ -512,6 +519,7 @@ method _exec_blame {cur_w cur_d options cur_s} { method _read_blame {fd cur_w cur_d cur_s} { upvar #0 $cur_d line_data variable group_colors + variable original_options if {$fd ne $current_fd} { catch {close $fd} @@ -681,7 +689,7 @@ method _read_blame {fd cur_w cur_d cur_s} { close $fd if {$cur_w eq $w_asim} { _exec_blame $this $w_amov @amov_data \ - [list -M -C -C] \ + $original_options \ { original location} } else { set current_fd {} -- 2.30.2