| commit | 784b7e2f25ce2a812d6b2dcbe4d3a2ea93484bb4 | |
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Tue, 5 Apr 2011 02:14:15 +0000 (4 22:14 -0400) | ||
| committer | Paul Mackerras <paulus@samba.org> | |
| Sun, 24 Jul 2011 05:34:54 +0000 (24 15:34 +1000) | ||
| tree | 987ec8f6f23aacb744ab91d34f55fcc75d783081 | treesnapshot (tar.gz zip) |
| parent | 0a2a979310c1ebc43d460fd8564981c9b3b99f07 | commitdiff |
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/../<repo-relative-file-name>. Fix it by feeding the diff tool
a path under $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>
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/../<repo-relative-file-name>. Fix it by feeding the diff tool
a path under $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>
| gitk | diffblobblamehistory |