git-gui: GIT_ASK_YESNO/GIT_ASKPASS patches from Git for Windows #358

dscho · 2019-09-26T14:11:23Z

This is another set of patches from Git for Windows' fork that have been sitting there since 2010, providing cross-platform GUI helpers to ask the user a question or allow typing in a password.

This patch series was first submitted as patthoyts/git-gui#5 which was ignored for almost three years, then re-submitted as prati0100/git-gui#3 which was rejected in favor of a contribution by mail.

The patches are based on Git GUI's master branch at https://github.com/j6t/git-gui/.

Changes since v1:

Rebased to current master branch of Git GUI, resolving merge conflicts.
Dropped double empty line.
Skip yes/no functions in favor of inline exit 0/exit 1.
The --title option is now documented in the git-gui--askyesno script.

Cc: Johannes Sixt j6t@kdbg.org
cc: Mark Levedahl mlevedahl@gmail.com

dscho · 2019-09-26T15:07:22Z

/azp run

azure-pipelines · 2019-09-26T15:07:32Z

Azure Pipelines successfully started running 2 pipeline(s).

dscho · 2019-09-26T15:11:10Z

/submit

gitgitgadget · 2019-09-26T15:15:44Z

Error: git merge-base 60c60b6 6025b38 failed: 128,
fatal: Not a valid commit name 60c60b6

dscho · 2019-09-26T15:28:20Z

/submit

gitgitgadget · 2019-09-26T15:30:16Z

Submitted as pull.358.git.gitgitgadget@gmail.com

WARNING: dscho has no public email address set on GitHub

dscho · 2019-09-26T17:51:13Z

/azp run

azure-pipelines · 2019-09-26T17:51:22Z

Azure Pipelines successfully started running 2 pipeline(s).

gitgitgadget · 2019-09-29T17:15:20Z

Makefile

 all:: $(GITGUI_MAIN) lib/tclIndex $(ALL_MSGFILES)

 install: all
 	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)


On the Git mailing list, Pratyush Yadav wrote (reply to this):

On 26/09/19 08:29AM, Heiko Voigt via GitGitGadget wrote: > From: Heiko Voigt <hvoigt@hvoigt.net> > > 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. I can't find any documentation related to this environment variable. A Google search does not yield any promising results. I don't see this mentioned in the git man page either, though that is to be expected because it seems to be a Windows-only variable. My point is, it would be nice if the commit message pointed to some sort of documentation for the environment variable. It would also help me in reviewing the patch if I know more about the variable. Either way, some minor comments down below. > > Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > Makefile | 2 ++ > git-gui--askyesno | 51 +++++++++++++++++++++++++++++++++++++++++++++++ > git-gui.sh | 3 +++ > 3 files changed, 56 insertions(+) > create mode 100755 git-gui--askyesno > > diff --git a/Makefile b/Makefile > index fe30be38dc..85633b73df 100644 > --- a/Makefile > +++ b/Makefile > @@ -291,6 +291,7 @@ install: all > $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1) > $(QUIET)$(INSTALL_X0)git-gui $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)' > $(QUIET)$(INSTALL_X0)git-gui--askpass $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)' > + $(QUIET)$(INSTALL_X0)git-gui--askyesno $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)' > $(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(INSTALL_L0)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L1)'$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' $(INSTALL_L2)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L3) &&) true > ifdef GITGUI_WINDOWS_WRAPPER > $(QUIET)$(INSTALL_R0)git-gui.tcl $(INSTALL_R1) '$(DESTDIR_SQ)$(gitexecdir_SQ)' > @@ -309,6 +310,7 @@ uninstall: > $(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(gitexecdir_SQ)' > $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui $(REMOVE_F1) > $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui--askpass $(REMOVE_F1) > + $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui--askyesno $(REMOVE_F1) > $(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/$p $(REMOVE_F1) &&) true > ifdef GITGUI_WINDOWS_WRAPPER > $(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui.tcl $(REMOVE_F1) I'm not too slick with Makefiles, but these changes look good. > diff --git a/git-gui--askyesno b/git-gui--askyesno > new file mode 100755 > index 0000000000..cf9c990d09 > --- /dev/null > +++ b/git-gui--askyesno > @@ -0,0 +1,51 @@ > +#!/bin/sh > +# Tcl ignores the next line -*- tcl -*- \ > +exec wish "$0" -- "$@" > + > +# This is an implementation of a simple yes no dialog > +# which is injected into the git commandline by git gui > +# in case a yesno question needs to be answered. > + > +set NS {} > +set use_ttk [package vsatisfies [package provide Tk] 8.5] > +if {$use_ttk} { > + set NS ttk > +} > + > +if {$argc < 1} { > + puts stderr "Usage: $argv0 <question>" > + exit 1 > +} else { > + set prompt [join $argv " "] > +} > + > +${NS}::frame .t > +${NS}::label .t.m -text $prompt -justify center -width 400px > +.t.m configure -wraplength 400px > +pack .t.m -side top -fill x -padx 20 -pady 20 -expand 1 > +pack .t -side top -fill x -ipadx 20 -ipady 20 -expand 1 > + > +${NS}::frame .b > +${NS}::frame .b.left -width 200 > +${NS}::button .b.yes -text Yes -command yes > +${NS}::button .b.no -text No -command no Do you really need separate functions for yes/no? I think something like -command {exit 1} and -command {exit 0} would do just fine. Either way... > + > + Nitpick: Drop one of the two blank lines. > +pack .b.left -side left -expand 1 -fill x > +pack .b.yes -side left -expand 1 > +pack .b.no -side right -expand 1 -ipadx 5 > +pack .b -side bottom -fill x -ipadx 20 -ipady 15 > + > +bind . <Key-Return> {exit 0} > +bind . <Key-Escape> {exit 1} ... do the same thing here. Call yes and no here too if you are using them above. I have no preference for either way, but I would like uniformity in these two spots. > + > +proc no {} { > + exit 1 > +} > + > +proc yes {} { > + exit 0 > +} > + > +wm title . "Question?" > +tk::PlaceWindow . > diff --git a/git-gui.sh b/git-gui.sh > index f9b323abff..76d8139b8d 100755 > --- a/git-gui.sh > +++ b/git-gui.sh > @@ -1248,6 +1248,9 @@ set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}] > if {![info exists env(SSH_ASKPASS)]} { > set env(SSH_ASKPASS) [gitexec git-gui--askpass] > } > +if {![info exists env(GIT_ASK_YESNO)]} { > + set env(GIT_ASK_YESNO) [gitexec git-gui--askyesno] > +} Since this seems to be a Windows-only variable, you might want to enable it only on Windows. Are there workflows on other platforms that would use this environment variable? -- Regards, Pratyush Yadav

gitgitgadget · 2019-09-29T17:18:15Z

git-gui.sh

 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]

 # Suggest our implementation of askpass, if none is set
 if {![info exists env(SSH_ASKPASS)]} {


On the Git mailing list, Pratyush Yadav wrote (reply to this):

What is the difference between SSH_ASKPASS and GIT_ASKPASS? On my first read, I assumed SSH_ASKPASS is replaced by GIT_ASKPASS, but I might be wrong. On 26/09/19 08:29AM, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > git-gui.sh | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/git-gui.sh b/git-gui.sh > index 76d8139b8d..66f046a0c7 100755 > --- a/git-gui.sh > +++ b/git-gui.sh > @@ -1248,6 +1248,9 @@ set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}] > if {![info exists env(SSH_ASKPASS)]} { > set env(SSH_ASKPASS) [gitexec git-gui--askpass] > } > +if {![info exists env(GIT_ASKPASS)]} { > + set env(GIT_ASKPASS) [gitexec git-gui--askpass] > +} > if {![info exists env(GIT_ASK_YESNO)]} { > set env(GIT_ASK_YESNO) [gitexec git-gui--askyesno] > } -- Regards, Pratyush Yadav

gitgitgadget · 2019-09-29T17:48:20Z

git-gui--askyesno

@@ -0,0 +1,56 @@
+#!/bin/sh


On the Git mailing list, Pratyush Yadav wrote (reply to this):

One minor nitpick: please add a comment at the top of the file documenting the `--title` option, and the usage of the program in general. Other than that, looks good. Thanks. On 26/09/19 08:29AM, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > "Question?" is maybe not the most informative thing to ask. In the > absence of better information, it is the best we can do, of course. > > However, Git for Windows' auto updater just learned the trick to use > git-gui--askyesno to ask the user whether to update now or not. And in > this scripted scenario, we can easily pass a command-line option to > change the window title. > > So let's support that with the new `--title <title>` option. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > git-gui--askyesno | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/git-gui--askyesno b/git-gui--askyesno > index cf9c990d09..45b0260eff 100755 > --- a/git-gui--askyesno > +++ b/git-gui--askyesno > @@ -12,10 +12,15 @@ if {$use_ttk} { > set NS ttk > } > > +set title "Question?" > if {$argc < 1} { > puts stderr "Usage: $argv0 <question>" > exit 1 > } else { > + if {$argc > 2 && [lindex $argv 0] == "--title"} { While this is probably not the most robust way of handling command line arguments, I guess it doesn't really make too much of a difference for something this simple. > + set title [lindex $argv 1] > + set argv [lreplace $argv 0 1] > + } > set prompt [join $argv " "] > } > > @@ -47,5 +52,5 @@ proc yes {} { > exit 0 > } > > -wm title . "Question?" > +wm title . $title > tk::PlaceWindow . > -- > gitgitgadget > -- Regards, Pratyush Yadav

gitgitgadget · 2019-09-29T18:06:22Z

git-gui--askyesno

@@ -0,0 +1,68 @@
+#!/bin/sh


On the Git mailing list, Pratyush Yadav wrote (reply to this):

Since this is a git-gui dialog/prompt, why not use the git-gui icon? This will mean some uniformity between all the platforms (though I'm not sure if other platforms even use GIT_ASK_YESNO). It would also probably save you the hacks needed to find out the git-for-windows icon. Well, there is the problem that the git-gui logo is not in any external file, and is inside git-gui.sh (as a vector image, but I'm not sure). But I'd like to at least start some discussion in this direction. On 26/09/19 08:30AM, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > For additional GUI goodness. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > git-gui--askyesno | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/git-gui--askyesno b/git-gui--askyesno > index 45b0260eff..c0c82e7cbd 100755 > --- a/git-gui--askyesno > +++ b/git-gui--askyesno > @@ -52,5 +52,17 @@ proc yes {} { > exit 0 > } > > +if {$::tcl_platform(platform) eq {windows}} { > + set icopath [file dirname [file normalize $argv0]] > + if {[file tail $icopath] eq {git-core}} { > + set icopath [file dirname $icopath] > + } > + set icopath [file dirname $icopath] > + set icopath [file join $icopath share git git-for-windows.ico] > + if {[file exists $icopath]} { > + wm iconbitmap . -default $icopath > + } > +} > + > wm title . $title > tk::PlaceWindow . > -- > gitgitgadget -- Regards, Pratyush Yadav

j6t · 2025-08-04T16:44:08Z

This will cause a conflict when merged into the latest Git GUI. 72c3f8b33a6fbb demonstrates how it should be resolved.

dscho · 2025-08-28T08:45:09Z

This will cause a conflict when merged into the latest Git GUI. 72c3f8b33a6fbb demonstrates how it should be resolved.

@j6t thank you for the notice! Unfortunately, I missed it, but I think I resolved it correctly.

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 Schindelin <johannes.schindelin@gmx.de>

"Question?" is maybe not the most informative thing to ask. In the absence of better information, it is the best we can do, of course. However, Git for Windows' auto updater just learned the trick to use git-gui--askyesno to ask the user whether to update now or not. And in this scripted scenario, we can easily pass a command-line option to change the window title. So let's support that with the new `--title <title>` option. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

This provides a unified look-and-feel in Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

dscho · 2025-08-28T08:58:06Z

/submit

gitgitgadget · 2025-08-28T08:59:11Z

Submitted as pull.358.v2.git.1756371530.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-358/dscho/git-gui-askpass-v2

To fetch this version to local tag pr-358/dscho/git-gui-askpass-v2:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-358/dscho/git-gui-askpass-v2

Johannes Sixt gracefully accepted that job, and we need to Cc: them instead of the previous maintainer. I noticed this when Pratyush was Cc:ed in v2 of gitgitgadget/git#358. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

gitgitgadget · 2025-08-28T13:40:29Z

git-gui--askyesno

+pack .b.no -side right -expand 1 -ipadx 5
+pack .b -side bottom -fill x -ipadx 20 -ipady 15
+
+bind . <Key-Return> {exit 0}


On the Git mailing list, Mark Levedahl wrote (reply to this):

git-gui includes git-gui--yesno that relies upon Tk 8.5 constructs, and this dialog box is not supported with Tk 9.0. Tk provides tk_messagebox for this same purpose, fully supported in Tk 8.5+, so use tk_messagebox instead. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> --- git-gui--askyesno | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/git-gui--askyesno b/git-gui--askyesno index 142d1bc..cd986f2 100755 --- a/git-gui--askyesno +++ b/git-gui--askyesno @@ -10,12 +10,6 @@ exec wish "$0" -- "$@" # overridden via the optional `--title` command-line # option. -set NS {} -set use_ttk [package vsatisfies [package provide Tk] 8.5] -if {$use_ttk} { - set NS ttk -} - set title "Question?" if {$argc < 1} { puts stderr "Usage: $argv0 <question>" @@ -28,25 +22,7 @@ if {$argc < 1} { set prompt [join $argv " "] } -${NS}::frame .t -${NS}::label .t.m -text $prompt -justify center -width 40 -.t.m configure -wraplength 400 -pack .t.m -side top -fill x -padx 20 -pady 20 -expand 1 -pack .t -side top -fill x -ipadx 20 -ipady 20 -expand 1 - -${NS}::frame .b -${NS}::frame .b.left -width 200 -${NS}::button .b.yes -text Yes -command {exit 0} -${NS}::button .b.no -text No -command {exit 1} - -pack .b.left -side left -expand 1 -fill x -pack .b.yes -side left -expand 1 -pack .b.no -side right -expand 1 -ipadx 5 -pack .b -side bottom -fill x -ipadx 20 -ipady 15 - -bind . <Key-Return> {exit 0} -bind . <Key-Escape> {exit 1} - +set dlgicon {question} if {$::tcl_platform(platform) eq {windows}} { set icopath [file dirname [file normalize $argv0]] if {[file tail $icopath] eq {git-core}} { @@ -55,9 +31,12 @@ if {$::tcl_platform(platform) eq {windows}} { set icopath [file dirname $icopath] set icopath [file join $icopath share git git-for-windows.ico] if {[file exists $icopath]} { - wm iconbitmap . -default $icopath + set dlgicon $icopath } } -wm title . $title -tk::PlaceWindow . +wm withdraw . + +option add *Dialog.msg.font {Sans 10} +set ans [tk_messageBox -icon $dlgicon -message $prompt -title $title -type yesno] +exit [expr $ans eq {no}] -- 2.51.0.99.15

On the Git mailing list, Johannes Schindelin wrote (reply to this):

Hi Mark, On Thu, 28 Aug 2025, Mark Levedahl wrote: > git-gui includes git-gui--yesno that relies upon Tk 8.5 constructs, and > this dialog box is not supported with Tk 9.0. Tk provides tk_messagebox > for this same purpose, fully supported in Tk 8.5+, so use tk_messagebox > instead. Thank you very much! Let's keep your patch separate, to give you full credit, and to keep Heiko's patch as close to the original that has survived in Git for Windows for so long. Ciao, Johannes > > Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> > --- > git-gui--askyesno | 35 +++++++---------------------------- > 1 file changed, 7 insertions(+), 28 deletions(-) > > diff --git a/git-gui--askyesno b/git-gui--askyesno > index 142d1bc..cd986f2 100755 > --- a/git-gui--askyesno > +++ b/git-gui--askyesno > @@ -10,12 +10,6 @@ exec wish "$0" -- "$@" > # overridden via the optional `--title` command-line > # option. > > -set NS {} > -set use_ttk [package vsatisfies [package provide Tk] 8.5] > -if {$use_ttk} { > - set NS ttk > -} > - > set title "Question?" > if {$argc < 1} { > puts stderr "Usage: $argv0 <question>" > @@ -28,25 +22,7 @@ if {$argc < 1} { > set prompt [join $argv " "] > } > > -${NS}::frame .t > -${NS}::label .t.m -text $prompt -justify center -width 40 > -.t.m configure -wraplength 400 > -pack .t.m -side top -fill x -padx 20 -pady 20 -expand 1 > -pack .t -side top -fill x -ipadx 20 -ipady 20 -expand 1 > - > -${NS}::frame .b > -${NS}::frame .b.left -width 200 > -${NS}::button .b.yes -text Yes -command {exit 0} > -${NS}::button .b.no -text No -command {exit 1} > - > -pack .b.left -side left -expand 1 -fill x > -pack .b.yes -side left -expand 1 > -pack .b.no -side right -expand 1 -ipadx 5 > -pack .b -side bottom -fill x -ipadx 20 -ipady 15 > - > -bind . <Key-Return> {exit 0} > -bind . <Key-Escape> {exit 1} > - > +set dlgicon {question} > if {$::tcl_platform(platform) eq {windows}} { > set icopath [file dirname [file normalize $argv0]] > if {[file tail $icopath] eq {git-core}} { > @@ -55,9 +31,12 @@ if {$::tcl_platform(platform) eq {windows}} { > set icopath [file dirname $icopath] > set icopath [file join $icopath share git git-for-windows.ico] > if {[file exists $icopath]} { > - wm iconbitmap . -default $icopath > + set dlgicon $icopath > } > } > > -wm title . $title > -tk::PlaceWindow . > +wm withdraw . > + > +option add *Dialog.msg.font {Sans 10} > +set ans [tk_messageBox -icon $dlgicon -message $prompt -title $title -type yesno] > +exit [expr $ans eq {no}] > -- > 2.51.0.99.15 > > >

On the Git mailing list, Johannes Sixt wrote (reply to this):

Am 28.08.25 um 15:33 schrieb Mark Levedahl: > git-gui includes git-gui--yesno that relies upon Tk 8.5 constructs, and /--yesno/--askyesno/? BTW, I wonder which constructs you mean. > this dialog box is not supported with Tk 9.0. Tk provides tk_messagebox > for this same purpose, fully supported in Tk 8.5+, so use tk_messagebox > instead. Which "this dialog box" do you mean here? The old code looks like a usual Tk main window to me. > > Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> > --- > git-gui--askyesno | 35 +++++++---------------------------- > 1 file changed, 7 insertions(+), 28 deletions(-) > > diff --git a/git-gui--askyesno b/git-gui--askyesno > index 142d1bc..cd986f2 100755 > --- a/git-gui--askyesno > +++ b/git-gui--askyesno > @@ -10,12 +10,6 @@ exec wish "$0" -- "$@" > # overridden via the optional `--title` command-line > # option. > > -set NS {} > -set use_ttk [package vsatisfies [package provide Tk] 8.5] > -if {$use_ttk} { > - set NS ttk > -} > - > set title "Question?" > if {$argc < 1} { > puts stderr "Usage: $argv0 <question>" > @@ -28,25 +22,7 @@ if {$argc < 1} { > set prompt [join $argv " "] > } > > -${NS}::frame .t > -${NS}::label .t.m -text $prompt -justify center -width 40 > -.t.m configure -wraplength 400 > -pack .t.m -side top -fill x -padx 20 -pady 20 -expand 1 > -pack .t -side top -fill x -ipadx 20 -ipady 20 -expand 1 > - > -${NS}::frame .b > -${NS}::frame .b.left -width 200 > -${NS}::button .b.yes -text Yes -command {exit 0} > -${NS}::button .b.no -text No -command {exit 1} > - > -pack .b.left -side left -expand 1 -fill x > -pack .b.yes -side left -expand 1 > -pack .b.no -side right -expand 1 -ipadx 5 > -pack .b -side bottom -fill x -ipadx 20 -ipady 15 > - > -bind . <Key-Return> {exit 0} > -bind . <Key-Escape> {exit 1} > - > +set dlgicon {question} > if {$::tcl_platform(platform) eq {windows}} { > set icopath [file dirname [file normalize $argv0]] > if {[file tail $icopath] eq {git-core}} { > @@ -55,9 +31,12 @@ if {$::tcl_platform(platform) eq {windows}} { > set icopath [file dirname $icopath] > set icopath [file join $icopath share git git-for-windows.ico] > if {[file exists $icopath]} { > - wm iconbitmap . -default $icopath > + set dlgicon $icopath > } > } I think there is a misunderstanding what the purpose of this icon is. It is the icon shown on the window frame/decoration, not the icon next to the text. > > -wm title . $title > -tk::PlaceWindow . > +wm withdraw . > + > +option add *Dialog.msg.font {Sans 10} Is this to replicate the old appearance? I don't think it is necessary. Let's assume tk_messageBox does a sensible thing. > +set ans [tk_messageBox -icon $dlgicon -message $prompt -title $title -type yesno] This option -icon can only be one of the words error, info, question or warning. It has nothing to do with the icon above. > +exit [expr $ans eq {no}] -- Hannes

gitgitgadget · 2025-08-28T13:40:32Z

User Mark Levedahl <mlevedahl@gmail.com> has been added to the cc: list.

gitgitgadget · 2025-08-28T17:51:23Z

git-gui.sh


 # Suggest our implementation of askpass, if none is set
 set argv0dir [file dirname [file normalize $::argv0]]
 if {![info exists env(SSH_ASKPASS)]} {


On the Git mailing list, Johannes Sixt wrote (reply to this):

Am 28.08.25 um 10:58 schrieb Johannes Schindelin via GitGitGadget: > @@ -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_ASKPASS)]} { > + set env(GIT_ASKPASS) [gitexec git-gui--askpass] Is this [gitexec ...] deliberate, or can this be [file join ...] like in the surrounding cases? If it is deliberate, we need an updated commit message and/or a comment, otherwise, I can amend locally while queuing. > +} > if {![info exists env(GIT_ASK_YESNO)]} { > set env(GIT_ASK_YESNO) [file join $argv0dir git-gui--askyesno] > }

dscho force-pushed the git-gui-askpass branch from 1632458 to 6025b38 Compare September 26, 2019 14:43

weekly-digest bot mentioned this pull request Sep 29, 2019

Weekly Digest (22 September, 2019 - 29 September, 2019) #366

Closed

gitgitgadget bot reviewed Sep 29, 2019

View reviewed changes

weekly-digest bot mentioned this pull request Oct 6, 2019

Weekly Digest (29 September, 2019 - 6 October, 2019) #377

Closed

j6t mentioned this pull request Aug 1, 2025

yesno_dialog j6t/git-gui#20

Draft

dscho force-pushed the git-gui-askpass branch from 6025b38 to 9f958ef Compare August 28, 2025 08:44

hvoigt and others added 4 commits August 28, 2025 10:52

git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

e1aef53

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

git-gui--askyesno (mingw): use Git for Windows' icon, if available

4b04832

This provides a unified look-and-feel in Git for Windows. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

dscho force-pushed the git-gui-askpass branch from 9f958ef to 4b04832 Compare August 28, 2025 08:56

This comment was marked as outdated.

Sign in to view

gitgitgadget bot reviewed Aug 28, 2025

View reviewed changes

git-gui: GIT_ASK_YESNO/GIT_ASKPASS patches from Git for Windows #358

Are you sure you want to change the base?

git-gui: GIT_ASK_YESNO/GIT_ASKPASS patches from Git for Windows #358

Uh oh!

Conversation

dscho commented Sep 26, 2019 • edited by gitgitgadget bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dscho commented Sep 26, 2019

Uh oh!

azure-pipelines bot commented Sep 26, 2019

Uh oh!

dscho commented Sep 26, 2019

Uh oh!

gitgitgadget bot commented Sep 26, 2019

Uh oh!

dscho commented Sep 26, 2019

Uh oh!

gitgitgadget bot commented Sep 26, 2019

Uh oh!

dscho commented Sep 26, 2019

Uh oh!

azure-pipelines bot commented Sep 26, 2019

Uh oh!

gitgitgadget bot Sep 29, 2019

Choose a reason for hiding this comment

Uh oh!

gitgitgadget bot Sep 29, 2019

Choose a reason for hiding this comment

Uh oh!

gitgitgadget bot Sep 29, 2019

Choose a reason for hiding this comment

Uh oh!

gitgitgadget bot Sep 29, 2019

Choose a reason for hiding this comment

Uh oh!

j6t commented Aug 4, 2025

Uh oh!

dscho commented Aug 28, 2025

Uh oh!

dscho commented Aug 28, 2025

Uh oh!

gitgitgadget bot commented Aug 28, 2025

Uh oh!

This comment was marked as outdated.

gitgitgadget bot Aug 28, 2025

Choose a reason for hiding this comment

Uh oh!

gitgitgadget bot Aug 28, 2025

Choose a reason for hiding this comment

Uh oh!

gitgitgadget bot Aug 28, 2025

Choose a reason for hiding this comment

Uh oh!

gitgitgadget bot commented Aug 28, 2025

Uh oh!

gitgitgadget bot Aug 28, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dscho commented Sep 26, 2019 •

edited by gitgitgadget bot

Loading