From 577c7e8fc663bc0e31b10e8691f03c3361dedc51 Mon Sep 17 00:00:00 2001
From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Sun, 2 Oct 2016 11:51:29 +0100
Subject: [PATCH] git-gui: fix detection of Cygwin

MSys2 might *look* like Cygwin, but it is *not* Cygwin... Unless it
is run with `MSYSTEM=MSYS`, that is.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 git-gui.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/git-gui.sh b/git-gui.sh
index 11048c7a0e..2381c3e548 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
-- 
2.11.4.GIT