From: Patrick Steinhardt <ps@pks.im>
Date: Fri, 27 Dec 2024 13:59:31 +0000 (+0100)
Subject: meson: fix generation of merge tools
X-Git-Tag: v2.48.0-rc2~5^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b88540045c3d70dbf4138c8f32209fea32e40d90;p=thirdparty%2Fgit.git

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>
---

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',