mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-07 09:43:00 +01:00
Code Activity

gitk: Fix "show origin of this line" with separate work tree

Browse source 
Running "show origin of this line" currently fails when the the work
tree is not the parent of the git directory.  Fix it by feeding
git-blame paths relative to $GIT_WORK_TREE instead of "$GIT_DIR/..".

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Martin von Zweigbergk 2011-04-04 22:14:13 -04:00 committed by Paul Mackerras
parent c332f44514
commit 9b6adf3433
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gitk
View file

@ -3589,7 +3589,7 @@ proc external_blame {parent_idx {line {}}} {
proc show_line_source {} { proc show_line_source {} {
global cmitmode currentid parents curview blamestuff blameinst global cmitmode currentid parents curview blamestuff blameinst
global diff_menu_line diff_menu_filebase flist_menu_file global diff_menu_line diff_menu_filebase flist_menu_file
global nullid nullid2 gitdir global nullid nullid2 gitdir cdup
set from_index {} set from_index {}
if {$cmitmode eq "tree"} { if {$cmitmode eq "tree"} {
@ -3642,7 +3642,7 @@ proc show_line_source {} {
} else { } else {
lappend blameargs $id lappend blameargs $id
} }
lappend blameargs -- [file join [file dirname $gitdir] $flist_menu_file] lappend blameargs -- [file join $cdup $flist_menu_file]
if {[catch { if {[catch {
set f [open $blameargs r] set f [open $blameargs r]
} err]} { } err]} {