gitk: Fix "git gui blame" invocation when called from top-level directory
When run in the top-level directory of a git repository, "git rev-parse --git-dir" doesn't return an absolute path, but merely ".git", so the selected file for "git gui blame" has a relative path. The function make_relative then tries to make the already relative path relative, which results in a path like "../../../../Makefile" with as many ".." as there are elements of [pwd]. This regression was introduced by commit 9712b81 (gitk: Fix bugs in blaming code, 2008-12-06), which fixed "git gui blame" when called from subdirs. This also fixes it for bare repositories. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
Markus Heidelberg committed
Nov 4, 2009 at 00:21 UTC
a4390ace1a871d786b33456d6e80728bd2ab3b61
1 file changed
+3
gitk
+3
@@ -3378,6 +3378,9 @@ proc index_sha1 {fname} {
3378
3379
# Turn an absolute path into one relative to the current directory
3380
proc make_relative {f} {
3381
+ if {[file pathtype $f] eq "relative"} {
3382
+ return $f
3383
+ }
3384
set elts [file split $f]
3385
set here [file split [pwd]]
3386
set ei 0