From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 21 Mar 2026 16:25:58 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/j6t/git-gui
X-Git-Tag: v2.54.0-rc0~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e8d538aab8fe4dd07ba9fb87b5c7edcfa5706ad;p=thirdparty%2Fgit.git

Merge branch 'master' of https://github.com/j6t/git-gui

* 'master' of https://github.com/j6t/git-gui:
  git-gui: grey out comment lines in commit message
  git-gui: wire up "git-gui--askyesno" with Meson
  git-gui: massage "git-gui--askyesno" with "generate-script.sh"
  git-gui: prefer shell at "/bin/sh" with Meson
  git-gui: fix use of GIT_CEILING_DIRECTORIES
  git-gui: shift tabstops to account for the first column of patch text
---

6e8d538aab8fe4dd07ba9fb87b5c7edcfa5706ad
diff --cc git-gui/.gitignore
index 5130b4f018,0000000000..38a41ebc58
mode 100644,000000..100644
--- a/git-gui/.gitignore
+++ b/git-gui/.gitignore
@@@ -1,8 -1,0 +1,9 @@@
 +.DS_Store
 +config.mak
 +git-gui.tcl
 +GIT-GUI-BUILD-OPTIONS
 +GIT-VERSION-FILE
 +git-gui
 +git-gui--askpass
++git-gui--askyesno
 +lib/tclIndex
diff --cc git-gui/GIT-VERSION-GEN
index c2767b4136,0000000000..2f729de4bb
mode 100755,000000..100755
--- a/git-gui/GIT-VERSION-GEN
+++ b/git-gui/GIT-VERSION-GEN
@@@ -1,94 -1,0 +1,102 @@@
 +#!/bin/sh
 +
 +DEF_VER=0.21.GITGUI
 +
 +LF='
 +'
 +
- if test "$#" -ne 2
++if test "$#" -lt 2
 +then
- 	echo >&2 "usage: $0 <SOURCE_DIR> <OUTPUT>"
++	echo >&2 "usage: $0 <SOURCE_DIR> <OUTPUT> [<PARENT_PROJECT_DIR>]"
 +	exit 1
 +fi
 +
 +SOURCE_DIR="$1"
 +OUTPUT="$2"
++PARENT_PROJECT_DIR="$3"
 +
 +# Protect us from reading Git version information outside of the Git directory
 +# in case it is not a repository itself, but embedded in an unrelated
- # repository.
- GIT_CEILING_DIRECTORIES="$SOURCE_DIR/.."
++# repository. The PARENT_PROJECT_DIR variable can be used to override this, for
++# example when git-gui is included as a subproject.
++if test -n "$PARENT_PROJECT_DIR"
++then
++	GIT_CEILING_DIRECTORIES="$PARENT_PROJECT_DIR/.."
++else
++	GIT_CEILING_DIRECTORIES="$SOURCE_DIR/.."
++fi
++
 +export GIT_CEILING_DIRECTORIES
 +
 +tree_search ()
 +{
 +	head=$1
 +	tree=$2
 +	for p in $(git -C "$SOURCE_DIR" rev-list --parents --max-count=1 $head 2>/dev/null)
 +	do
 +		test $tree = $(git -C "$SOURCE_DIR" rev-parse $p^{tree} 2>/dev/null) &&
 +		vn=$(git -C "$SOURCE_DIR" describe --abbrev=4 $p 2>/dev/null) &&
 +		case "$vn" in
 +		gitgui-[0-9]*) echo $vn; break;;
 +		esac
 +	done
 +}
 +
 +# Always use the tarball version file if found, just
 +# in case we are somehow contained in a larger git
 +# repository that doesn't actually track our state.
 +# (At least one package manager is doing this.)
 +#
 +# We may be a subproject, so try looking for the merge
 +# commit that supplied this directory content if we are
 +# not at the toplevel.  We probably will always be the
 +# second parent in the commit, but we shouldn't rely on
 +# that fact.
 +#
 +# If we are at the toplevel or the merge assumption fails
 +# try looking for a gitgui-* tag.
 +
 +if test -f "$SOURCE_DIR"/version &&
 +   VN=$(cat "$SOURCE_DIR"/version)
 +then
 +	: happy
 +elif prefix="$(git -C "$SOURCE_DIR" rev-parse --show-prefix 2>/dev/null)"
 +   test -n "$prefix" &&
 +   head=$(git -C "$SOURCE_DIR" rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
 +   tree=$(git -C "$SOURCE_DIR" rev-parse --verify "HEAD:$prefix" 2>/dev/null) &&
 +   VN=$(tree_search $head $tree)
 +   case "$VN" in
 +   gitgui-[0-9]*) : happy ;;
 +   *) (exit 1) ;;
 +   esac
 +then
 +	VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
 +elif VN=$(git -C "$SOURCE_DIR" describe --abbrev=4 HEAD 2>/dev/null) &&
 +   case "$VN" in
 +   gitgui-[0-9]*) : happy ;;
 +   *) (exit 1) ;;
 +   esac
 +then
 +	VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
 +else
 +	VN="$DEF_VER"
 +fi
 +
 +dirty=$(git -C "$SOURCE_DIR" diff-index --name-only HEAD 2>/dev/null) || dirty=
 +case "$dirty" in
 +'')
 +	;;
 +*)
 +	VN="$VN-dirty" ;;
 +esac
 +
 +if test -r "$OUTPUT"
 +then
 +	VC=$(sed -e 's/^GITGUI_VERSION=//' <"$OUTPUT")
 +else
 +	VC=unset
 +fi
 +test "$VN" = "$VC" || {
 +	echo >&2 "GITGUI_VERSION=$VN"
 +	echo "GITGUI_VERSION=$VN" >"$OUTPUT"
 +}
diff --cc git-gui/Makefile
index 69b0b84435,0000000000..ca01068810
mode 100644,000000..100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@@ -1,231 -1,0 +1,234 @@@
 +# The default target of this Makefile is...
 +all::
 +
 +# Define V=1 to have a more verbose compile.
 +#
 +# Define NO_MSGFMT if you do not have msgfmt from the GNU gettext
 +# package and want to use our rough pure Tcl po->msg translator.
 +# TCL_PATH must be valid for this to work.
 +#
 +
 +GIT-VERSION-FILE: FORCE
- 	@$(SHELL_PATH) ./GIT-VERSION-GEN . $@
++	@$(SHELL_PATH) ./GIT-VERSION-GEN . $@ "$(PARENT_PROJECT_DIR)"
 +
 +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 +uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
 +
 +SCRIPT_SH = git-gui.sh
 +GITGUI_MAIN := git-gui
 +GITGUI_BUILT_INS = git-citool
 +ALL_LIBFILES = $(wildcard lib/*.tcl)
 +PRELOAD_FILES = lib/class.tcl
 +NONTCL_LIBFILES = \
 +	lib/git-gui.ico \
 +	$(wildcard lib/win32_*.js) \
 +#end NONTCL_LIBFILES
 +
 +ifndef SHELL_PATH
 +	SHELL_PATH = /bin/sh
 +endif
 +
 +ifndef gitexecdir
 +	gitexecdir := $(shell git --exec-path)
 +endif
 +
 +ifndef sharedir
 +ifeq (git-core,$(notdir $(gitexecdir)))
 +	sharedir := $(dir $(patsubst %/,%,$(dir $(gitexecdir))))share
 +else
 +	sharedir := $(dir $(gitexecdir))share
 +endif
 +endif
 +
 +ifndef INSTALL
 +	INSTALL = install
 +endif
 +
 +RM_RF     ?= rm -rf
 +RMDIR     ?= rmdir
 +
 +INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
 +INSTALL_D1 =
 +INSTALL_R0 = $(INSTALL) -m 644 # space is required here
 +INSTALL_R1 =
 +INSTALL_X0 = $(INSTALL) -m 755 # space is required here
 +INSTALL_X1 =
 +INSTALL_L0 = rm -f # space is required here
 +INSTALL_L1 = && ln # space is required here
 +INSTALL_L2 =
 +INSTALL_L3 =
 +
 +REMOVE_D0  = $(RMDIR) # space is required here
 +REMOVE_D1  = || true
 +REMOVE_F0  = $(RM_RF) # space is required here
 +REMOVE_F1  =
 +CLEAN_DST  = true
 +
 +ifndef V
 +	QUIET          = @
 +	QUIET_GEN      = $(QUIET)echo '   ' GEN '$@' &&
 +	QUIET_INDEX    = $(QUIET)echo '   ' INDEX $(dir $@) &&
 +	QUIET_MSGFMT0  = $(QUIET)printf '    MSGFMT %12s ' $@ && v=`
 +	QUIET_MSGFMT1  = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages*//g'
 +
 +	INSTALL_D0 = dir=
 +	INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
 +	INSTALL_R0 = src=
 +	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
 +	INSTALL_X0 = src=
 +	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
 +
 +	INSTALL_L0 = dst=
 +	INSTALL_L1 = && src=
 +	INSTALL_L2 = && dst=
 +	INSTALL_L3 = && echo '   ' 'LINK       ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
 +
 +	CLEAN_DST = echo ' ' UNINSTALL
 +	REMOVE_D0 = dir=
 +	REMOVE_D1 = && echo ' ' REMOVE $$dir && test -d "$$dir" && $(RMDIR) "$$dir" || true
 +	REMOVE_F0 = dst=
 +	REMOVE_F1 = && echo '   ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst"
 +endif
 +
 +TCLTK_PATH ?= wish
 +ifeq (./,$(dir $(TCLTK_PATH)))
 +	TCL_PATH ?= $(subst wish,tclsh,$(TCLTK_PATH))
 +else
 +	TCL_PATH ?= $(dir $(TCLTK_PATH))$(notdir $(subst wish,tclsh,$(TCLTK_PATH)))
 +endif
 +
 +ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
 +QUIET_GEN =
 +endif
 +
 +-include config.mak
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 +TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH))
 +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 +
 +gg_libdir ?= $(sharedir)/git-gui/lib
 +libdir_SQ  = $(subst ','\'',$(gg_libdir))
 +exedir     = $(dir $(gitexecdir))share/git-gui/lib
 +
 +GITGUI_RELATIVE :=
 +
 +ifeq ($(exedir),$(gg_libdir))
 +	GITGUI_RELATIVE := 1
 +endif
 +ifneq (,$(findstring MINGW,$(uname_S)))
 +ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
 +	NO_MSGFMT=1
 +endif
 +	GITGUI_WINDOWS_WRAPPER := YesPlease
 +	GITGUI_RELATIVE := 1
 +endif
 +
 +ifdef GITGUI_WINDOWS_WRAPPER
 +GITGUI_MAIN := git-gui.tcl
 +
 +git-gui: windows/git-gui.sh
 +	cp $< $@
 +endif
 +
 +$(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-BUILD-OPTIONS generate-git-gui.sh
 +	$(QUIET_GEN)$(SHELL_PATH) generate-git-gui.sh "$<" "$@" ./GIT-GUI-BUILD-OPTIONS ./GIT-VERSION-FILE
 +
 +XGETTEXT   ?= xgettext
 +ifdef NO_MSGFMT
 +	MSGFMT ?= $(TCL_PATH) po/po2msg.sh
 +else
 +	MSGFMT ?= msgfmt
 +        ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0)
 +		MSGFMT := $(TCL_PATH) po/po2msg.sh
 +        endif
 +endif
 +
 +msgsdir     = $(gg_libdir)/msgs
 +msgsdir_SQ  = $(subst ','\'',$(msgsdir))
 +PO_TEMPLATE = po/git-gui.pot
 +ALL_POFILES = $(wildcard po/*.po)
 +ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
 +
 +$(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES)
 +	$(XGETTEXT) -kmc -LTcl -o $@ $(SCRIPT_SH) $(ALL_LIBFILES)
 +update-po:: $(PO_TEMPLATE)
 +	$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
 +$(ALL_MSGFILES): %.msg : %.po
 +	$(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1)
 +
 +lib/tclIndex: $(ALL_LIBFILES) generate-tclindex.sh GIT-GUI-BUILD-OPTIONS
 +	$(QUIET_INDEX)$(SHELL_PATH) generate-tclindex.sh . ./GIT-GUI-BUILD-OPTIONS $(ALL_LIBFILES)
 +
 +GIT-GUI-BUILD-OPTIONS: FORCE
 +	@sed \
 +		-e 's|@GITGUI_GITEXECDIR@|$(gitexecdir_SQ)|' \
 +		-e 's|@GITGUI_LIBDIR@|$(libdir_SQ)|' \
 +		-e 's|@GITGUI_RELATIVE@|$(GITGUI_RELATIVE)|' \
 +		-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
 +		-e 's|@TCLTK_PATH@|$(TCLTK_PATH_SQ)|' \
 +		-e 's|@TCL_PATH@|$(TCL_PATH_SQ)|' \
 +		$@.in >$@+
 +	@if grep -q '^[A-Z][A-Z_]*=@.*@$$' $@+; then echo "Unsubstituted build options in $@" >&2 && exit 1; fi
 +	@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
 +
 +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)
 +	$(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)'
 +endif
 +	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
 +	$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
 +	$(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
 +	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
 +	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
 +
 +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)
 +endif
 +	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
 +	$(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
 +	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(msgsdir_SQ)'
 +	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
 +	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(REMOVE_D1)
 +	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(REMOVE_D1)
 +	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)
 +	$(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)
 +
 +dist-version: GIT-VERSION-FILE
 +	@mkdir -p $(TARDIR)
 +	@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
 +endif
 +
 +.PHONY: all install uninstall dist-version clean
 +.PHONY: FORCE
diff --cc git-gui/meson.build
index 320ba09ecf,0000000000..a8119aa29f
mode 100644,000000..100644
--- a/git-gui/meson.build
+++ b/git-gui/meson.build
@@@ -1,97 -1,0 +1,100 @@@
 +project('git-gui',
 +  meson_version: '>=0.61.0',
 +)
 +
 +fs = import('fs')
 +
- shell = find_program('sh')
++shell = find_program('/bin/sh', 'sh')
 +tclsh = find_program('tclsh')
 +wish = find_program('wish')
 +
 +build_options_config = configuration_data()
 +if target_machine.system() == 'windows'
 +  build_options_config.set('GITGUI_RELATIVE', '1')
 +else
 +  build_options_config.set('GITGUI_RELATIVE', '')
 +endif
 +build_options_config.set_quoted('GITGUI_GITEXECDIR', get_option('prefix') / get_option('libexecdir') / 'git-core')
 +build_options_config.set_quoted('GITGUI_LIBDIR', get_option('prefix') / get_option('datadir') / 'git-gui/lib')
 +build_options_config.set_quoted('SHELL_PATH', fs.as_posix(shell.full_path()))
 +build_options_config.set_quoted('TCLTK_PATH', fs.as_posix(wish.full_path()))
 +build_options_config.set_quoted('TCL_PATH', fs.as_posix(tclsh.full_path()))
 +
 +build_options = configure_file(
 +  input: 'GIT-GUI-BUILD-OPTIONS.in',
 +  output: 'GIT-GUI-BUILD-OPTIONS',
 +  configuration: build_options_config,
 +)
 +
 +version_file = custom_target(
 +  input: 'GIT-VERSION-GEN',
 +  output: 'GIT-VERSION-FILE',
 +  command: [
 +    shell,
 +    '@INPUT@',
 +    meson.current_source_dir(),
 +    '@OUTPUT@',
++    get_option('parent_project_dir'),
 +  ],
 +  build_always_stale: true,
 +)
 +
 +gitgui_main = 'git-gui'
 +gitgui_main_install_dir = get_option('libexecdir') / 'git-core'
 +
 +if target_machine.system() == 'windows'
 +  gitgui_main = 'git-gui.tcl'
 +
 +  configure_file(
 +    input: 'windows/git-gui.sh',
 +    output: 'git-gui',
 +    copy: true,
 +    install: true,
 +    install_dir: get_option('libexecdir') / 'git-core',
 +  )
 +endif
 +
- custom_target(
-   output: 'git-gui--askpass',
-   input: 'git-gui--askpass.sh',
-   command: [
-     shell,
-     meson.current_source_dir() / 'generate-script.sh',
-     '@OUTPUT@',
-     '@INPUT@',
-     meson.current_build_dir() / 'GIT-GUI-BUILD-OPTIONS',
-   ],
-   install: true,
-   install_dir: get_option('libexecdir') / 'git-core',
- )
++foreach script : [ 'git-gui--askpass', 'git-gui--askyesno' ]
++  custom_target(
++    output: script,
++    input: script + '.sh',
++    command: [
++      shell,
++      meson.current_source_dir() / 'generate-script.sh',
++      '@OUTPUT@',
++      '@INPUT@',
++      meson.current_build_dir() / 'GIT-GUI-BUILD-OPTIONS',
++    ],
++    install: true,
++    install_dir: get_option('libexecdir') / 'git-core',
++  )
++endforeach
 +
 +custom_target(
 +  input: 'git-gui.sh',
 +  output: gitgui_main,
 +  command: [
 +    shell,
 +    meson.current_source_dir() / 'generate-git-gui.sh',
 +    '@INPUT@',
 +    '@OUTPUT@',
 +    meson.current_build_dir() / 'GIT-GUI-BUILD-OPTIONS',
 +    meson.current_build_dir() / 'GIT-VERSION-FILE',
 +  ],
 +  depends: [
 +    version_file,
 +  ],
 +  depend_files: [
 +    build_options,
 +  ],
 +  install: true,
 +  install_dir: gitgui_main_install_dir,
 +)
 +
 +install_symlink('git-citool',
 +  install_dir: get_option('libexecdir') / 'git-core',
 +  pointing_to: 'git-gui',
 +)
 +
 +subdir('lib')
 +subdir('po')
diff --cc git-gui/meson_options.txt
index 0000000000,0000000000..7591a34218
new file mode 100644
--- /dev/null
+++ b/git-gui/meson_options.txt
@@@ -1,0 -1,0 +1,2 @@@
++option('parent_project_dir', type: 'string', value: '',
++  description: 'The directory of the parent project. This is used so that the version can be determined even in case git-gui is included as a subtree.')