aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-07-14 11:19:24 -0700
committerJunio C Hamano <gitster@pobox.com>2025-07-14 11:19:25 -0700
commit0d046cba65d2027ab64cb7d2292e164f5a3765d3 (patch)
tree0e4a47a63c40e7799135d627e4075c3c6e3cb5b2
parentMerge branch 'ps/use-reftable-as-default-in-3.0' (diff)
parentcoccicheck: fail "make" when it fails (diff)
downloadgit-0d046cba65d2027ab64cb7d2292e164f5a3765d3.tar.gz
git-0d046cba65d2027ab64cb7d2292e164f5a3765d3.zip
Merge branch 'jc/coccicheck-fails-make-when-it-fails'
"make coccicheck" succeeds even when spatch made suggestions, which has been updated to fail in such a case. * jc/coccicheck-fails-make-when-it-fails: coccicheck: fail "make" when it fails
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1a8d5cf703..41912f9344 100644
--- a/Makefile
+++ b/Makefile
@@ -3468,11 +3468,14 @@ endif
coccicheck-test: $(COCCI_TEST_RES_GEN)
coccicheck: coccicheck-test
+
ifdef SPATCH_CONCAT_COCCI
-coccicheck: contrib/coccinelle/ALL.cocci.patch
+COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = contrib/coccinelle/ALL.cocci.patch
else
-coccicheck: $(COCCICHECK_PATCHES_INTREE)
+COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = $(COCCICHECK_PATCHES_INTREE)
endif
+coccicheck: $(COCCICHECK_PATCH_MUST_BE_EMPTY_FILES)
+ ! grep -q ^ $(COCCICHECK_PATCH_MUST_BE_EMPTY_FILES) /dev/null
# See contrib/coccinelle/README
coccicheck-pending: coccicheck-test