Skip to content

Commit 725227a

Browse files
authored
More robust check for mintty when creating winpty bash aliases (#664)
`winpty` aliases cause some issues (see git-for-windows/git#5960) and aren't necessary outside of mintty. After the bug was fixed in git-for-windows/msys2-runtime#122 that prevented Store apps from not getting their standard handles set up properly by the MSYS2 runtime, those aliases aren't even necessary _inside_ MinTTY. So off they go. Enjoy your retirement, aliases!
2 parents 6b79dca + 724d013 commit 725227a

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

ReleaseNotes.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ See [http://git-scm.com/](http://git-scm.com/) for further details about Git inc
1010
# Known issues
1111
* On Windows 10 before 1703, or when Developer Mode is turned off, special permissions are required when cloning repositories with symbolic links, therefore support for symbolic links is disabled by default. Use `git clone -c core.symlinks=true <URL>` to enable it, see details [here](https://gitforwindows.org/symbolic-links).
1212
* If configured to use Plink, you will have to connect with [putty](http://www.chiark.greenend.org.uk/~sgtatham/putty/) first and accept the host key.
13-
* Some console programs, most notably non-MSYS2 Python, PHP, Node and OpenSSL, interact correctly with MinTTY only when called through `winpty` (e.g. the Python console needs to be started as `winpty python` instead of just `python`).
1413
* If you specify command-line options starting with a slash, POSIX-to-Windows path conversion will kick in converting e.g. "`/usr/bin/bash.exe`" to "`C:\Program Files\Git\usr\bin\bash.exe`". When that is not desired -- e.g. "`--upload-pack=/opt/git/bin/git-upload-pack`" or "`-L/regex/`" -- you need to set the environment variable `MSYS_NO_PATHCONV` temporarily, like so:
1514

1615
> `MSYS_NO_PATHCONV=1 git blame -L/pathconv/ msys2_path_conv.cc`

git-extra/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
55
pkgname=($_realname
66
"${MINGW_PACKAGE_PREFIX}-${_realname}")
77
_ver_base=1.1
8-
pkgver=1.1.687.f502a63dc
8+
pkgver=1.1.689.fe8c5259c
99
pkgrel=1
1010
pkgdesc="Git for Windows extra files"
1111
arch=('any')
@@ -75,7 +75,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
7575
'402c51eba82453a76f5110f4754bb1005df507a6e4532574c2b9627ff4e1dc81'
7676
'8433a9e72b3bc9c3bc7903b54b868399bdb17a6c8de4af4dd5450dd42859c898'
7777
'e2d0e4c58dca8ad7dba59df5db37a6ffb917f984edf67ae51d3f4c2db06e459b'
78-
'8056f48ae61f2cba668c07b31c56229914912444ca6656205aaffce59b8e6b11'
78+
'a7540390bf956f33f6497a87c8986e124a8ecdacad26d0f75695c83dc2410d96'
7979
'32c9a549ecb1c9e06622221dae98a000ac2ce9c2be97d5d0c4f80610af3dc55c'
8080
'02d38e480a1ec4227e94a5aa073945901680aa3387e3386f8b77f10426ebbc75'
8181
'dcbd1b981d5b899afe30151a5f5a27ea52025ff1335f131af1b5891f62ddd55b'

git-extra/aliases.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,3 @@
44
# --show-control-chars: help showing Korean or accented characters
55
alias ls='ls -F --color=auto --show-control-chars'
66
alias ll='ls -l'
7-
8-
case "$TERM" in
9-
xterm*)
10-
# The following programs are known to require a Win32 Console
11-
# for interactive usage, therefore let's launch them through winpty
12-
# when run inside `mintty`.
13-
for name in node ipython php php5 psql python2.7 winget
14-
do
15-
case "$(type -p "$name".exe 2>/dev/null)" in
16-
''|/usr/bin/*) continue;;
17-
esac
18-
alias $name="winpty $name.exe"
19-
done
20-
;;
21-
esac

0 commit comments

Comments
 (0)