From ed8ed94de8b8ff7e89b46a72bdf378824de59053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Wed, 16 Sep 2026 13:19:45 +0200
Subject: [PATCH 1/2] git-askpass: try harder to launch in the foreground
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-askpass should launch in the foreground to ask users for their
Passwords. We've had reports that it doesn't always launch that way.
Try harder to launch in the foreground and avoid callers seemingly hanging
while waiting for input in a background window.

This fixes https://github.com/git-for-windows/git/issues/6369

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
---
 git-extra/PKGBUILD       | 2 +-
 git-extra/git-askpass.rc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-extra/PKGBUILD b/git-extra/PKGBUILD
index 02b9a81f55..9d9ed85ab7 100644
--- a/git-extra/PKGBUILD
+++ b/git-extra/PKGBUILD
@@ -97,7 +97,7 @@ sha256sums=('b6448dac5fe317ada8a0b8e73c86b907467bf339f0449fb0a2595debe59eedfe'
             '78307cd6c04a16240f68197e9155697bc75d5df8e4c8514ff67712bb93a1cd4a'
             '0b4ffbfcf0ab30e0cbcd03507439e468e4ce6d1ccfd6b8f0b3ce3ab2146dc8ee'
             '51e31c6ce824f66b9a8310f1ac10ccdc06b60967a557c996868bc0d9c9866ccf'
-            '0dd30dc3acd406e70b5ff08fb0bf180ec3782119455989af18c05cf59d09df64')
+            '74f2dab13a560c851456c41d3ee643a1f7f50083dc757d2e1a1baca760fa9a9a')
 
 prepare() {
   case "$MSYSTEM_CARCH" in
diff --git a/git-extra/git-askpass.rc b/git-extra/git-askpass.rc
index 60f29f03f9..670434b3da 100644
--- a/git-extra/git-askpass.rc
+++ b/git-extra/git-askpass.rc
@@ -7,7 +7,7 @@
 //
 
 IDD_PASSWORD DIALOGEX 0, 0, 253, 94
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Git for Windows"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN

From 6c0213d51494ba1a44081f4e6e36928ec17d3996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Wed, 16 Sep 2026 11:37:11 +0000
Subject: [PATCH 2/2] git-extra: update checksums
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
---
 git-extra/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-extra/PKGBUILD b/git-extra/PKGBUILD
index 9d9ed85ab7..eca20e176b 100644
--- a/git-extra/PKGBUILD
+++ b/git-extra/PKGBUILD
@@ -4,7 +4,7 @@ _realname="git-extra"
 pkgbase="mingw-w64-${_realname}"
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.715.85f886165
+pkgver=1.1.717.ed8ed94de
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')