From 784b7e2f25ce2a812d6b2dcbe4d3a2ea93484bb4 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Mon, 4 Apr 2011 22:14:15 -0400 Subject: [PATCH] gitk: Fix "External diff" with separate work tree Running "External diff" to compare the index and work tree currently brings up an empty blame view when the work tree is not the parent of the git directory. This is because the file that is taken from the work tree is assumed to be in $GIT_DIR/../. Fix it by feeding the diff tool a path under $GIT_WORK_TREE instead of "$GIT_DIR/..". Signed-off-by: Martin von Zweigbergk Signed-off-by: Paul Mackerras --- gitk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gitk b/gitk index 862646779f..5d150059df 100755 --- a/gitk +++ b/gitk @@ -3364,10 +3364,10 @@ proc save_file_from_commit {filename output what} { proc external_diff_get_one_file {diffid filename diffdir} { global nullid nullid2 nullfile - global gitdir + global worktree if {$diffid == $nullid} { - set difffile [file join [file dirname $gitdir] $filename] + set difffile [file join $worktree $filename] if {[file exists $difffile]} { return $difffile } @@ -11650,6 +11650,7 @@ set cdup {} if {$isworktree} { set cdup [exec git rev-parse --show-cdup] } +set worktree [exec git rev-parse --show-toplevel] setcoords makewindow catch { -- 2.11.4.GIT