meson: fix generation of merge tools
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>
Patrick Steinhardt committed
Dec 27, 2024 at 14:59 UTC
b88540045c3d70dbf4138c8f32209fea32e40d90
1 file changed
+1
-2
Documentation/meson.build
+1
-2
@@ -318,12 +318,11 @@ foreach mode : [ 'diff', 'merge' ]
318
shell,
319
'@INPUT@',
320
'..',
321
- 'diff',
321
+ mode,
322
'@OUTPUT@'
323
],
324
env: [
325
'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools',
326
- 'TOOL_MODE=' + mode,
326
],
327
input: 'generate-mergetool-list.sh',
328
output: 'mergetools-' + mode + '.txt',