gitk: Put temporary directory inside .git
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Tue, 5 Apr 2011 02:14:16 +0000 (22:14 -0400)
committerPaul Mackerras <paulus@samba.org>
Sun, 24 Jul 2011 05:34:54 +0000 (15:34 +1000)
When running "External diff" from gitk, the "from" and "to" files will
first be copied into a directory that is currently
".git/../.gitk-tmp.$pid". When gitk is closed, the directory is
deleted. When the work tree is not at ".git/.." (which is supported
since the previous commit), that directory may not even be git-related
and it does not seem unlikely that permissions may not allow the
temporary directory to be created there. Move the directory inside
.git instead.

This introduces a regression in the case that the .git directory
is readonly, but .git/.. is writeable.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk
diff --git a/gitk b/gitk
index 5d150059df399153b09c62fdacc76fdf6df010cb..e263b49f5abc1aeb8ba2ff4cf11dfbce58f843f8 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -3331,8 +3331,7 @@ proc gitknewtmpdir {} {
     global diffnum gitktmpdir gitdir
 
     if {![info exists gitktmpdir]} {
-       set gitktmpdir [file join [file dirname $gitdir] \
-                           [format ".gitk-tmp.%s" [pid]]]
+       set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
        if {[catch {file mkdir $gitktmpdir} err]} {
            error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
            unset gitktmpdir