git-gui: fix detection of Cygwin

diff --git a/git-gui.sh b/git-gui.sh
index 11048c7a0e94f598b168de98d18fda9aea420c7d..2381c3e54807ecd0b326d8c11b3f0c6008c5636a 100755 (executable)
--- 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