aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-04-08 11:43:15 -0700
committerJunio C Hamano <gitster@pobox.com>2025-04-08 11:43:15 -0700
commit91ca5f1b1da4c3b29d89b246ffb8e95d03204092 (patch)
treeff67824398e0eed527fbe4e357fc7a97b08ac335
parent876e7bb3ca6d12c6794635a40f3699a5416e1672 (diff)
parentd2827dc31e6769ddd552a34593d28cecd5f3392d (diff)
downloadgit-91ca5f1b1da4c3b29d89b246ffb8e95d03204092.tar.gz
Merge branch 'es/meson-build-skip-coccinelle'
Build fix. * es/meson-build-skip-coccinelle: meson: disable coccinelle configuration when building from a tarball
-rw-r--r--contrib/coccinelle/meson.build7
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/coccinelle/meson.build b/contrib/coccinelle/meson.build
index 5d76a7fee6..ea054c924f 100644
--- a/contrib/coccinelle/meson.build
+++ b/contrib/coccinelle/meson.build
@@ -1,4 +1,9 @@
-spatch = find_program('spatch', required: get_option('coccinelle'))
+coccinelle_opt = get_option('coccinelle').require(
+ fs.exists(meson.project_source_root() / '.git'),
+ error_message: 'coccinelle can only be run from a git checkout',
+)
+
+spatch = find_program('spatch', required: coccinelle_opt)
if not spatch.found()
subdir_done()
endif