From ef7a52d0a1b8113c247179bca1db8d5ffcb31993 Mon Sep 17 00:00:00 2001
From: Andrew Bradley <cspotcode@gmail.com>
Date: Mon, 1 Dec 2025 10:35:21 -0500
Subject: [PATCH 1/2] More robust check for mintty when creating winpty bash
 aliases

Aliases cause a few issues and aren't necessary outside of mintty, so this check detects mintty but excludes Windows Terminal, VSCode terminal, and other modern windows terminals that `export TERM=xterm-256color`

Signed-off-by: Andrew Bradley <cspotcode@gmail.com>
---
 git-extra/aliases.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/git-extra/aliases.sh b/git-extra/aliases.sh
index b3e4c89f07..f63432c6ad 100755
--- a/git-extra/aliases.sh
+++ b/git-extra/aliases.sh
@@ -5,8 +5,8 @@
 alias ls='ls -F --color=auto --show-control-chars'
 alias ll='ls -l'
 
-case "$TERM" in
-xterm*)
+if [ "${TERM_PROGRAM:-}" = "mintty" ]
+then
 	# The following programs are known to require a Win32 Console
 	# for interactive usage, therefore let's launch them through winpty
 	# when run inside `mintty`.
@@ -18,4 +18,4 @@ xterm*)
 		alias $name="winpty $name.exe"
 	done
 	;;
-esac
+fi

From 0befbe6b432260e382d8f39d7685fcac82ea86ef Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 1 Dec 2025 16:50:39 +0000
Subject: [PATCH 2/2] git-extra: update checksums

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-extra/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-extra/PKGBUILD b/git-extra/PKGBUILD
index ca41219301..3b5b21452e 100644
--- a/git-extra/PKGBUILD
+++ b/git-extra/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=($_realname
         "${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.685.a08718cdd
+pkgver=1.1.687.ef7a52d0a
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')
@@ -75,7 +75,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
             '402c51eba82453a76f5110f4754bb1005df507a6e4532574c2b9627ff4e1dc81'
             '8433a9e72b3bc9c3bc7903b54b868399bdb17a6c8de4af4dd5450dd42859c898'
             'e2d0e4c58dca8ad7dba59df5db37a6ffb917f984edf67ae51d3f4c2db06e459b'
-            '8056f48ae61f2cba668c07b31c56229914912444ca6656205aaffce59b8e6b11'
+            '255bb3542c2679c48068dd09f4f598a456a9acc7ace5864b794b6afcb1b2893d'
             '32c9a549ecb1c9e06622221dae98a000ac2ce9c2be97d5d0c4f80610af3dc55c'
             '02d38e480a1ec4227e94a5aa073945901680aa3387e3386f8b77f10426ebbc75'
             'dcbd1b981d5b899afe30151a5f5a27ea52025ff1335f131af1b5891f62ddd55b'