Re: [PATCH] Handle failure of core.worktree to identify the working directory.
From: Kirill Smelkov <hidden>
Date: 2016-06-15 22:48:18
On Thu, Feb 18, 2010 at 02:11:21AM +0000, Pat Thoyts wrote:
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 <redacted>
Now it works, thanks. Tested-by: Kirill Smelkov <redacted>
quoted hunk ↗ jump to hunk
quoted
Git-gui as shipped with todays git.git master is a bit broken: in git.git master (v1.7.0-29-g6d81630), try running: $ git gui blame xdiff-interface.h Then select first line 'd9ea d9ea 1 #ifndef XDIFF_INTERFACE_H', right click to popup context menu, select "Show History Context" --> --> git gui errors with: "Error: couldn't change working directory to "": no ... Thanks, Kirillgit-gui.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)diff --git a/git-gui.sh b/git-gui.sh index 8996d2d..ec81b15 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 {}} {