diff options
| author | Patrick Steinhardt <ps@pks.im> | 2026-02-10 14:18:04 +0100 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2026-02-17 06:59:04 +0100 |
| commit | d4fa9a6aef48ec9660de2be937418ec1d802aad4 (patch) | |
| tree | cb3df266bb6c05932d87aac98869a6251c9b2cf8 | |
| parent | 8334d5e459de0386cf7b5b87cec136d62c14c3ad (diff) | |
| download | git-d4fa9a6aef48ec9660de2be937418ec1d802aad4.tar.xz | |
git-gui: massage "git-gui--askyesno" with "generate-script.sh"
In e749c87 (git-gui: provide question helper for retry fallback on
Windows, 2025-08-28) we have introudced a new "git-gui--askyesno" helper
script. While the script is conceptually similar to our existing helper
script "git-gui--askpass", we don't massage it via "generate-script.sh".
This means that build options like the path to the wish shell are not
propagated correctly.
Fix this issue.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | git-gui--askyesno.sh (renamed from git-gui--askyesno) | 0 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 5130b4f018..38a41ebc58 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ GIT-GUI-BUILD-OPTIONS GIT-VERSION-FILE git-gui git-gui--askpass +git-gui--askyesno lib/tclIndex @@ -177,10 +177,13 @@ GIT-GUI-BUILD-OPTIONS: FORCE git-gui--askpass: git-gui--askpass.sh GIT-GUI-BUILD-OPTIONS generate-script.sh $(QUIET_GEN)$(SHELL_PATH) generate-script.sh $@ $< ./GIT-GUI-BUILD-OPTIONS +git-gui--askyesno: git-gui--askyesno.sh GIT-GUI-BUILD-OPTIONS generate-script.sh + $(QUIET_GEN)$(SHELL_PATH) generate-script.sh $@ $< ./GIT-GUI-BUILD-OPTIONS + ifdef GITGUI_WINDOWS_WRAPPER all:: git-gui endif -all:: $(GITGUI_MAIN) git-gui--askpass lib/tclIndex $(ALL_MSGFILES) +all:: $(GITGUI_MAIN) git-gui--askpass git-gui--askyesno lib/tclIndex $(ALL_MSGFILES) install: all $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1) @@ -221,7 +224,7 @@ dist-version: GIT-VERSION-FILE @sed 's|^GITGUI_VERSION=||' <GIT-VERSION-FILE >$(TARDIR)/version clean:: - $(RM_RF) $(GITGUI_MAIN) git-gui--askpass lib/tclIndex po/*.msg $(PO_TEMPLATE) + $(RM_RF) $(GITGUI_MAIN) git-gui--askpass git-gui--askyesno lib/tclIndex po/*.msg $(PO_TEMPLATE) $(RM_RF) GIT-VERSION-FILE GIT-GUI-BUILD-OPTIONS ifdef GITGUI_WINDOWS_WRAPPER $(RM_RF) git-gui diff --git a/git-gui--askyesno b/git-gui--askyesno.sh index 142d1bc3de..142d1bc3de 100755 --- a/git-gui--askyesno +++ b/git-gui--askyesno.sh |