meson: fix overwritten `git` variable
We're assigning the `git` variable in three places: - In "meson.build" to store the external Git executable. - In "meson.build" to store the compiled Git executable. - In "Documentation/meson.build" to store the external Git executable, a second time. The last case is only needed because we overwrite the original variable with the built version. Rename the variable used for the built Git executable so that we don't have to resolve the external Git executable multiple times. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Feb 26, 2025 at 09:22 UTC
3ee3a6eb522fd3ad672e7734e5708f5ddcc63fce
2 files changed
+3
-4
Documentation/meson.build
-1
index 2a26fa8a5f..6438fa6792 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -283,7 +283,6 @@ elif docs_backend == 'asciidoctor'
]
endif
-git = find_program('git', required: false)
xmlto = find_program('xmlto')
cmd_lists = [
meson.build
+3
-3
index 5bf6a914ea..930b85a6df 100644
--- a/meson.build
+++ b/meson.build
@@ -1608,13 +1608,13 @@ libgit_commonmain = declare_dependency(
bin_wrappers = [ ]
test_dependencies = [ ]
-git = executable('git',
+git_builtin = executable('git',
sources: builtin_sources + 'git.c',
dependencies: [libgit_commonmain],
install: true,
install_dir: get_option('libexecdir') / 'git-core',
)
-bin_wrappers += git
+bin_wrappers += git_builtin
test_dependencies += executable('git-daemon',
sources: 'daemon.c',
@@ -1705,7 +1705,7 @@ test_dependencies += executable('git-imap-send',
foreach alias : [ 'git-receive-pack', 'git-upload-archive', 'git-upload-pack' ]
bin_wrappers += executable(alias,
- objects: git.extract_all_objects(recursive: false),
+ objects: git_builtin.extract_all_objects(recursive: false),
dependencies: [libgit_commonmain],
)