Re: [PATCH v2 2/4] git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 17, 2025, 14:03 UTC
- Message-ID
- <1295d263-e60d-0acb-91ef-9de888398840@gmx.de>
- In-Reply-To
- <816cd946-4f25-4ce8-aa06-6babf9e90751@kdbg.org>
Hi Hannes,
On Thu, 28 Aug 2025, Johannes Sixt wrote:
Show 11 quoted lines
> 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.Sorry for the late reply. As you suspected (seeing as you changed it when integrating sthe patch into your tree), it was just an artifact of history.
This patch entered Git for Windows back in the msysGit days, in https://github.com/msysgit/git/commit/1644f8ea0159 (2010-07-23), according to my records that corresponds to the v1.7.2.3.msysgit.0 timeframe, when this block was surrounded by similar, `[gitexec]`-using code blocks.
The patch remained virtually unchanged until https://github.com/git-for-windows/git/commit/076c4bc42171 (2025-06-16), which still made it into v2.50.0.
Starting with https://github.com/git-for-windows/git/commit/ab11df9a3899 (2025-08-05), this block's context changed, and I must have changed the block itself in reaction to it in Git for Windows (but I failed to miss it before sending the patch you reviewed). The patch made it into v2.51.0-rc0 in that new shape, using `[file join ...]` instead of `[gitexec]`.
Luckily, you made the very same adjustment before committing it as https://github.com/git/git/commit/aeaabebc1a10 (2025-08-28), so all is good.
Ciao, Johannes
Show 7 quoted lines
>
> > +}
> > if {![info exists env(GIT_ASK_YESNO)]} {
> > set env(GIT_ASK_YESNO) [file join $argv0dir git-gui--askyesno]
> > }
>
>