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>

diff --git a/.gitignore b/.gitignore
index 5130b4f0189518462c7c387eb97fa2697ea308b6..38a41ebc58237f528196f54a8e6f35c802b8538a 100644 (file)
--- 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

diff --git a/Makefile b/Makefile
index 5679af62bdc0cc3cc9a56622ee026deeac32c6f1..ca01068810bbe6bf31bb7b135982319da2fe63ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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
similarity index 100%
rename from git-gui--askyesno
rename to git-gui--askyesno.sh