mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: fix overwritten git variable

Browse Source 
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>
This commit is contained in:
Patrick Steinhardt
2025-02-26 09:22:21 +01:00
committed by Junio C Hamano
parent 16c89dcf80
commit 3ee3a6eb52
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/meson.build
View File

@ -283,7 +283,6 @@ elif docs_backend == 'asciidoctor'
]
endif
git = find_program('git', required: false)
xmlto = find_program('xmlto')
cmd_lists = [

6
meson.build
View File

@ -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],
)