Revert 77954 - Use TERM to distinguish between console and msysgit.
It is cleaner this way since in Win32 console, the
value is always "dumb" while in msysgit it is always
"msys" The user shouldn't change the value of $TERM
in msysgit otherwise their whole copy of msysgit
will be flaky.
BUG=70548
TEST=check $TERM in windows
Review URL: http://codereview.chromium.org/6686027
TBR=mhm@chromium.org
Review URL: http://codereview.chromium.org/6683033
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@77972 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/git_cl/git_cl.py b/git_cl/git_cl.py
index 0c50651..3b7ca33 100644
--- a/git_cl/git_cl.py
+++ b/git_cl/git_cl.py
@@ -712,8 +712,9 @@
# Open up the default editor in the system to get the CL description.
cmd = [editor, filename]
- if sys.platform == 'win32' and os.environ['TERM'] == 'msys':
- # Msysgit requires the usage of 'env' to be present.
+ if sys.platform == 'win32' and 'mingw\\bin' in os.environ['PATH']:
+ # Msysgit requires the usage of 'env' to be present. The only way to
+ # accomplish that is by reading the environment variable for mingw\bin.
cmd.insert(0, 'env')
try:
subprocess.check_call(cmd)