Skip to content

Commit

Permalink
gitk: Fix "blame parent commit" with separate work tree
Browse files Browse the repository at this point in the history
Running "blame parent commit" currently brings up an empty blame view
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>
  • Loading branch information
Martin von Zweigbergk authored and Paul Mackerras committed Jul 24, 2011
1 parent 9b6adf3 commit 0a2a979
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -3557,7 +3557,7 @@ proc make_relative {f} {
}

proc external_blame {parent_idx {line {}}} {
global flist_menu_file gitdir
global flist_menu_file cdup
global nullid nullid2
global parentlist selectedline currentid

Expand All @@ -3576,7 +3576,7 @@ proc external_blame {parent_idx {line {}}} {
if {$line ne {} && $line > 1} {
lappend cmdline "--line=$line"
}
set f [file join [file dirname $gitdir] $flist_menu_file]
set f [file join $cdup $flist_menu_file]
# Unfortunately it seems git gui blame doesn't like
# being given an absolute path...
set f [make_relative $f]
Expand Down

0 comments on commit 0a2a979

Please sign in to comment.