File tree Expand file tree Collapse file tree 1 file changed +11
-0
lines changed Expand file tree Collapse file tree 1 file changed +11
-0
lines changed Original file line number Diff line number Diff line change @@ -585,6 +585,17 @@ cpplint:
585
585
586
586
lint : jslint cpplint
587
587
588
+ CONFLICT_RE =^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
589
+ lint-ci : jslint cpplint
590
+ @if ! ( grep -IEqrs " $( CONFLICT_RE) " benchmark deps doc lib src test tools ) \
591
+ && ! ( find . -maxdepth 1 -type f | xargs grep -IEqs " $( CONFLICT_RE) " ); then \
592
+ exit 0 ; \
593
+ else \
594
+ echo " " >&2 ; \
595
+ echo " Conflict marker detected in one or more files. Please fix them first." >&2 ; \
596
+ exit 1 ; \
597
+ fi
598
+
588
599
.PHONY : lint cpplint jslint bench clean docopen docclean doc dist distclean \
589
600
check uninstall install install-includes install-bin all staticlib \
590
601
dynamiclib test test-all test-addons build-addons website-upload pkg \
You can’t perform that action at this time.
0 commit comments