From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Aug 2018 22:08:25 +0000 (-0700)
Subject: Merge branch 'sg/coccicheck-updates'
X-Git-Tag: v2.19.0-rc0~72
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bce8031d9a1ff3b791f9e4c1cd1e5634faaf55fb?ds=inline;hp=-c

Merge branch 'sg/coccicheck-updates'

Update the way we use Coccinelle to find out-of-style code that
need to be modernised.

* sg/coccicheck-updates:
coccinelle: extract dedicated make target to clean Coccinelle's results
coccinelle: put sane filenames into output patches
coccinelle: exclude sha1dc source files from static analysis
coccinelle: use $(addsuffix) in 'coccicheck' make target
coccinelle: mark the 'coccicheck' make target as .PHONY
---

bce8031d9a1ff3b791f9e4c1cd1e5634faaf55fb
diff --combined Makefile
index 8251c394a0,d616c04125..e3364a42a5
--- a/Makefile
+++ b/Makefile
@@@ -484,11 -484,6 +484,11 @@@ all:
  #        The DEVELOPER mode enables -Wextra with a few exceptions. By
  #        setting this flag the exceptions are removed, and all of
  #        -Wextra is used.
 +#
 +#    pedantic:
 +#
 +#        Enable -pedantic compilation. This also disables
 +#        USE_PARENS_AROUND_GETTEXT_N to produce only relevant warnings.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -569,7 -564,7 +569,7 @@@ SPATCH = spatc
  export TCL_PATH TCLTK_PATH
  
  SPARSE_FLAGS =
- SPATCH_FLAGS = --all-includes
+ SPATCH_FLAGS = --all-includes --patch .
  
  
  
@@@ -714,7 -709,6 +714,7 @@@ TEST_BUILTINS_OBJS += test-example-deco
  TEST_BUILTINS_OBJS += test-genrandom.o
  TEST_BUILTINS_OBJS += test-hashmap.o
  TEST_BUILTINS_OBJS += test-index-version.o
 +TEST_BUILTINS_OBJS += test-json-writer.o
  TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
  TEST_BUILTINS_OBJS += test-match-trees.o
  TEST_BUILTINS_OBJS += test-mergesort.o
@@@ -725,7 -719,6 +725,7 @@@ TEST_BUILTINS_OBJS += test-prio-queue.
  TEST_BUILTINS_OBJS += test-read-cache.o
  TEST_BUILTINS_OBJS += test-ref-store.o
  TEST_BUILTINS_OBJS += test-regex.o
 +TEST_BUILTINS_OBJS += test-repository.o
  TEST_BUILTINS_OBJS += test-revision-walking.o
  TEST_BUILTINS_OBJS += test-run-command.o
  TEST_BUILTINS_OBJS += test-scrap-cache-tree.o
@@@ -866,7 -859,6 +866,7 @@@ LIB_OBJS += ewah/ewah_bitmap.
  LIB_OBJS += ewah/ewah_io.o
  LIB_OBJS += ewah/ewah_rlw.o
  LIB_OBJS += exec-cmd.o
 +LIB_OBJS += fetch-negotiator.o
  LIB_OBJS += fetch-object.o
  LIB_OBJS += fetch-pack.o
  LIB_OBJS += fsck.o
@@@ -879,7 -871,6 +879,7 @@@ LIB_OBJS += hashmap.
  LIB_OBJS += help.o
  LIB_OBJS += hex.o
  LIB_OBJS += ident.o
 +LIB_OBJS += json-writer.o
  LIB_OBJS += kwset.o
  LIB_OBJS += levenshtein.o
  LIB_OBJS += line-log.o
@@@ -900,8 -891,6 +900,8 @@@ LIB_OBJS += merge-blobs.
  LIB_OBJS += merge-recursive.o
  LIB_OBJS += mergesort.o
  LIB_OBJS += name-hash.o
 +LIB_OBJS += negotiator/default.o
 +LIB_OBJS += negotiator/skipping.o
  LIB_OBJS += notes.o
  LIB_OBJS += notes-cache.o
  LIB_OBJS += notes-merge.o
@@@ -2680,10 -2669,16 +2680,16 @@@ check: command-list.
  	fi
  
  C_SOURCES = $(patsubst %.o,%.c,$(C_OBJ))
- %.cocci.patch: %.cocci $(C_SOURCES)
+ ifdef DC_SHA1_SUBMODULE
+ COCCI_SOURCES = $(filter-out sha1collisiondetection/%,$(C_SOURCES))
+ else
+ COCCI_SOURCES = $(filter-out sha1dc/%,$(C_SOURCES))
+ endif
+ 
+ %.cocci.patch: %.cocci $(COCCI_SOURCES)
  	@echo '    ' SPATCH $<; \
  	ret=0; \
- 	for f in $(C_SOURCES); do \
+ 	for f in $(COCCI_SOURCES); do \
  		$(SPATCH) --sp-file $< $$f $(SPATCH_FLAGS) || \
  			{ ret=$$?; break; }; \
  	done >$@+ 2>$@.log; \
@@@ -2697,7 -2692,9 +2703,9 @@@
  	then \
  		echo '    ' SPATCH result: $@; \
  	fi
- coccicheck: $(patsubst %.cocci,%.cocci.patch,$(wildcard contrib/coccinelle/*.cocci))
+ coccicheck: $(addsuffix .patch,$(wildcard contrib/coccinelle/*.cocci))
+ 
+ .PHONY: coccicheck
  
  ### Installation rules
  
@@@ -2909,7 -2906,10 +2917,10 @@@ profile-clean
  	$(RM) $(addsuffix *.gcda,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
  	$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
  
- clean: profile-clean coverage-clean
+ cocciclean:
+ 	$(RM) contrib/coccinelle/*.cocci.patch*
+ 
+ clean: profile-clean coverage-clean cocciclean
  	$(RM) *.res
  	$(RM) $(OBJECTS)
  	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
@@@ -2921,7 -2921,6 +2932,6 @@@
  	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
  	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
  	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
- 	$(RM) contrib/coccinelle/*.cocci.patch*
  	$(MAKE) -C Documentation/ clean
  ifndef NO_PERL
  	$(MAKE) -C gitweb clean
@@@ -2937,7 -2936,7 +2947,7 @@@ endi
  	$(RM) GIT-USER-AGENT GIT-PREFIX
  	$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PERL-HEADER GIT-PYTHON-VARS
  
- .PHONY: all install profile-clean clean strip
+ .PHONY: all install profile-clean cocciclean clean strip
  .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
  .PHONY: FORCE cscope