diff options
| author | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:30:32 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:30:32 +0100 |
| commit | c7fb7bfa114323a6608a0f40aeee453b66406287 (patch) | |
| tree | f91113b0116d759d1ebce4395ac05d34b1bede2d /git-gui.sh | |
| parent | 408c2120e02cf2a96cd44c69fe3baf406d4de157 (diff) | |
| parent | f110c46902859832f798fc6777ac6bd0e661804a (diff) | |
| download | git-c7fb7bfa114323a6608a0f40aeee453b66406287.tar.gz git-c7fb7bfa114323a6608a0f40aeee453b66406287.tar.xz | |
Merge branch 'pt/git4win-mods' into pu
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 1ed51857e..b097c8c92 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -275,6 +275,10 @@ proc is_Cygwin {} { set _iscygwin 0 } else { set _iscygwin 1 + # Handle MSys2 which is only cygwin when MSYSTEM is MSYS. + if {[info exists ::env(MSYSTEM)] && $::env(MSYSTEM) ne "MSYS"} { + set _iscygwin 0 + } } } else { set _iscygwin 0 |