diff options
| author | John Murphy <john.murphy@baml.com> | 2013-09-04 11:03:48 -0400 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2013-09-06 22:42:07 +0100 |
| commit | 4394faf6e53e8b91c82332aa4f2b77616350a81b (patch) | |
| tree | 98d7d9b2122ee3efa3d0016357368470134a0292 | |
| parent | git-gui: right half window is paned (diff) | |
| download | git-4394faf6e53e8b91c82332aa4f2b77616350a81b.tar.gz git-4394faf6e53e8b91c82332aa4f2b77616350a81b.zip | |
git-gui: corrected setup of git worktree under cygwin.
Under cygwin the _gitworktree variable needs to contain the Windows
style path string so the output provided by git rev-parse must
be converted from cygwin path style to native.
Reviewed-by: Jesse Welch <jesse.welch@baml.com>
Signed-off-by: John Patrick Murphy <john.murphy@baml.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| -rwxr-xr-x | git-gui.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh index b62ae4a949..66db995ed0 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1284,7 +1284,11 @@ apply_config # v1.7.0 introduced --show-toplevel to return the canonical work-tree if {[package vsatisfies $_git_version 1.7.0]} { - set _gitworktree [git rev-parse --show-toplevel] + if { [is_Cygwin] } { + catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]} + } else { + set _gitworktree [git rev-parse --show-toplevel] + } } else { # try to set work tree from environment, core.worktree or use # cdup to obtain a relative path to the top of the worktree. If |