Giuseppe Bilotta <giuseppe.bilotta@xxxxxxxxx> wrote:
> Don't rely on the git worktree being the updir of the gitdir, since it
> might not be. Instead, define (and use) a new _gitworktree global
> variable, setting it to $GIT_WORK_TREE if present, or to whatever we
> guess the correct worktree is.
>
> Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@xxxxxxxxx>
> ---
> git-gui/git-gui.sh | 25 +++++++++++++++++++------
> 1 files changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
> index 658a728..94317c7 100755
> --- a/git-gui/git-gui.sh
> +++ b/git-gui/git-gui.sh
> @@ -1062,13 +1063,19 @@ if {![file isdirectory $_gitdir]} {
> error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
> exit 1
> }
> +set _gitworktree $env(GIT_WORK_TREE)
In TCL it is an error if an environment variable is undefined
when accessed. You need to wrap this up in a catch block to handle
the error:
Error in startup script: can't read "env(GIT_WORK_TREE)": no such variable
while executing
"set _gitworktree $env(GIT_WORK_TREE)"
(file "./git-gui.sh" line 1066)
Also, what about honoring core.worktree as a setting, in
addition to $env(GIT_WORK_TREE) like the git wrapper does?
--
Shawn.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
