averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: fix generation of merge tools

Browse Source 
Our buildsystems generate a list of diff and merge tools that ultimately
end up in our documentation. And while Meson does wire up the logic, it
tries to use the TOOL_MODE environment variable to set up the mode. This
is wrong though: the mode is set via an argument that we have fixed to
'diff' mode by accident.

Fix this such that merge tools are properly generated.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-12-27 14:59:31 +01:00
committed by Junio C Hamano
parent 2a8bd34c55
commit b88540045c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/meson.build
View File

@@ -318,12 +318,11 @@ foreach mode : [ 'diff', 'merge' ]
shell, shell,
'@INPUT@', '@INPUT@',
'..', '..',
'diff', mode,
'@OUTPUT@' '@OUTPUT@'
], ],
env: [ env: [
'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools', 'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools',
'TOOL_MODE=' + mode,
], ],
input: 'generate-mergetool-list.sh', input: 'generate-mergetool-list.sh',
output: 'mergetools-' + mode + '.txt', output: 'mergetools-' + mode + '.txt',