From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Oct 2019 02:40:48 +0000 (+0900)
Subject: Merge branch 'dl/allow-running-cocci-verbosely'
X-Git-Tag: v2.24.0-rc0~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07ff6dd0ea7388ffc6cf4485928ceffe57eac1f1;p=thirdparty%2Fgit.git

Merge branch 'dl/allow-running-cocci-verbosely'

Dev support update.

* dl/allow-running-cocci-verbosely:
  Makefile: respect $(V) in %.cocci.patch target
---

07ff6dd0ea7388ffc6cf4485928ceffe57eac1f1
diff --cc Makefile
index de60c8e7aa,ba6bb5fe6d..58b92af54b
--- a/Makefile
+++ b/Makefile
@@@ -1883,8 -1871,9 +1883,9 @@@ ifndef 
  	QUIET_MSGFMT   = @echo '   ' MSGFMT $@;
  	QUIET_GCOV     = @echo '   ' GCOV $@;
  	QUIET_SP       = @echo '   ' SP $<;
 -	QUIET_HDR      = @echo '   ' HDR $<;
 +	QUIET_HDR      = @echo '   ' HDR $(<:hcc=h);
  	QUIET_RC       = @echo '   ' RC $@;
+ 	QUIET_SPATCH   = @echo '   ' SPATCH $<;
  	QUIET_SUBDIR0  = +@subdir=
  	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
  			 $(MAKE) $(PRINT_DIR) -C $$subdir
@@@ -2809,11 -2792,15 +2810,11 @@@ check: command-list.
  		exit 1; \
  	fi
  
 -C_SOURCES = $(patsubst %.o,%.c,$(C_OBJ))
 -ifdef DC_SHA1_SUBMODULE
 -COCCI_SOURCES = $(filter-out sha1collisiondetection/%,$(C_SOURCES))
 -else
 -COCCI_SOURCES = $(filter-out sha1dc/%,$(C_SOURCES))
 -endif
 +FOUND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES)))
 +COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES))
  
  %.cocci.patch: %.cocci $(COCCI_SOURCES)
- 	@echo '    ' SPATCH $<; \
+ 	$(QUIET_SPATCH) \
  	if test $(SPATCH_BATCH_SIZE) = 0; then \
  		limit=; \
  	else \