From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Sat, 10 Jul 2010 22:40:59 +0000 (+0100)
Subject: git-gui: Handle failure of core.worktree to identify the working directory.
X-Git-Tag: v1.7.2.2~29^2^2~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=13a3d637b2d83fceb432fe7b9e21f8c4d882fa41;p=git.git

git-gui: Handle failure of core.worktree to identify the working directory.

Commit 21985a11 'git-gui: handle non-standard worktree locations' attempts
to use either GIT_WORK_TREE or core.worktree to set the _gitworktree
variable but these may not be set which leads to a failure to launch
gitk to review history. Use _gitdir to set the location for a standard
git layout where the parent of the .git directory is the working tree.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---

diff --git a/git-gui.sh b/git-gui.sh
index 8996d2d6b..ec81b1559 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1158,6 +1158,9 @@ apply_config
 # try to set work tree from environment, falling back to core.worktree
 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
 	set _gitworktree [get_config core.worktree]
+	if {$_gitworktree eq ""} {
+		set _gitworktree [file dirname [file normalize $_gitdir]]
+	}
 }
 if {$_prefix ne {}} {
 	if {$_gitworktree eq {}} {