diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-12-27 14:59:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-27 08:28:09 -0800 |
| commit | b88540045c3d70dbf4138c8f32209fea32e40d90 (patch) | |
| tree | fa12b969336c8300cc7c40dfde235a01038ee49b | |
| parent | 2a8bd34c5576e02fed38d85dc5c90ffb9d4ecfb3 (diff) | |
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>
| -rw-r--r-- | Documentation/meson.build | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/meson.build b/Documentation/meson.build index b3c8b6c563..c2512328ca 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -318,12 +318,11 @@ foreach mode : [ 'diff', 'merge' ] shell, '@INPUT@', '..', - 'diff', + mode, '@OUTPUT@' ], env: [ 'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools', - 'TOOL_MODE=' + mode, ], input: 'generate-mergetool-list.sh', output: 'mergetools-' + mode + '.txt', |