commit 1ae0839ef24d303f77cec165df5223a66131567c Merge: f6efb3a18 2d34d4d1a Author: teor teor@torproject.org Date: Thu Apr 9 19:41:19 2020 +1000

Merge branch 'maint-0.4.2' into maint-0.4.3

Remove check-best-practices from check-local in maint-0.4.3. (The check-local jobs are all on separate lines in 0.4.3.)

Makefile.am | 1 - 1 file changed, 1 deletion(-)

diff --cc Makefile.am index ac61a990f,eaffbe41a..8b55bf0e3 --- a/Makefile.am +++ b/Makefile.am @@@ -267,13 -245,7 +267,12 @@@ test: al shellcheck: $(top_srcdir)/scripts/maint/checkShellScripts.sh

-check-local: check-spaces check-changes check-includes shellcheck +check-local: \ + check-spaces \ + check-changes \ + check-includes \ - check-best-practices \ + shellcheck \ + check-cocci

need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \