aboutsummaryrefslogtreecommitdiffstats
path: root/git-gui.sh
diff options
context:
space:
mode:
authorHeiko Voigt <hvoigt@hvoigt.net>2025-08-28 08:58:47 +0000
committerJohannes Sixt <j6t@kdbg.org>2025-08-28 22:51:36 +0200
commite749c87e75f925540d1bf362b754fc7adf342960 (patch)
tree7fbe3a0075cab813f5d9bbcc47ee03c60ea9ca69 /git-gui.sh
parentMerge branch 'cb/no-tcl86-on-macos' (diff)
downloadgit-e749c87e75f925540d1bf362b754fc7adf342960.tar.gz
git-e749c87e75f925540d1bf362b754fc7adf342960.zip
git-gui: provide question helper for retry fallback on Windows
Make use of the new environment variable GIT_ASK_YESNO to support the recently implemented fallback in case unlink, rename or rmdir fail for files in use on Windows. The added dialog will present a yes/no question to the the user which will currently be used by the windows compat layer to let the user retry a failed file operation. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Diffstat (limited to '')
-rwxr-xr-xgit-gui.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh
index a931d7f7c9..1a4b73a337 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1130,6 +1130,9 @@ set argv0dir [file dirname [file normalize $::argv0]]
if {![info exists env(SSH_ASKPASS)]} {
set env(SSH_ASKPASS) [file join $argv0dir git-gui--askpass]
}
+if {![info exists env(GIT_ASK_YESNO)]} {
+ set env(GIT_ASK_YESNO) [file join $argv0dir git-gui--askyesno]
+}
unset argv0dir
######################################################################