From: Patrick Steinhardt Date: Wed, 26 Feb 2025 08:22:21 +0000 (+0100) Subject: meson: fix overwritten `git` variable X-Git-Tag: v2.49.0-rc1~6^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ee3a6eb522fd3ad672e7734e5708f5ddcc63fce;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/meson.build b/Documentation/meson.build 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 = [ diff --git a/meson.build b/meson.build 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], )