Skip to content

Commit d4fa9a6

Browse files
committed
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>
1 parent 8334d5e commit d4fa9a6

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ GIT-GUI-BUILD-OPTIONS
55
GIT-VERSION-FILE
66
git-gui
77
git-gui--askpass
8+
git-gui--askyesno
89
lib/tclIndex

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,13 @@ GIT-GUI-BUILD-OPTIONS: FORCE
177177
git-gui--askpass: git-gui--askpass.sh GIT-GUI-BUILD-OPTIONS generate-script.sh
178178
$(QUIET_GEN)$(SHELL_PATH) generate-script.sh $@ $< ./GIT-GUI-BUILD-OPTIONS
179179

180+
git-gui--askyesno: git-gui--askyesno.sh GIT-GUI-BUILD-OPTIONS generate-script.sh
181+
$(QUIET_GEN)$(SHELL_PATH) generate-script.sh $@ $< ./GIT-GUI-BUILD-OPTIONS
182+
180183
ifdef GITGUI_WINDOWS_WRAPPER
181184
all:: git-gui
182185
endif
183-
all:: $(GITGUI_MAIN) git-gui--askpass lib/tclIndex $(ALL_MSGFILES)
186+
all:: $(GITGUI_MAIN) git-gui--askpass git-gui--askyesno lib/tclIndex $(ALL_MSGFILES)
184187

185188
install: all
186189
$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)
@@ -221,7 +224,7 @@ dist-version: GIT-VERSION-FILE
221224
@sed 's|^GITGUI_VERSION=||' <GIT-VERSION-FILE >$(TARDIR)/version
222225

223226
clean::
224-
$(RM_RF) $(GITGUI_MAIN) git-gui--askpass lib/tclIndex po/*.msg $(PO_TEMPLATE)
227+
$(RM_RF) $(GITGUI_MAIN) git-gui--askpass git-gui--askyesno lib/tclIndex po/*.msg $(PO_TEMPLATE)
225228
$(RM_RF) GIT-VERSION-FILE GIT-GUI-BUILD-OPTIONS
226229
ifdef GITGUI_WINDOWS_WRAPPER
227230
$(RM_RF) git-gui
File renamed without changes.

0 commit comments

Comments
 (0)