Merge changes from topic "fix_checkpatch_merges" into integration
* changes: fix(plat/st): remove double space fix(checkpatch): do not check merge commits
This commit is contained in:
commit
89ff55fef4
3
Makefile
3
Makefile
|
@ -1318,7 +1318,8 @@ checkpatch: locate-checkpatch
|
||||||
echo " with ${CHECKPATCH_OPTS} option(s)"; \
|
echo " with ${CHECKPATCH_OPTS} option(s)"; \
|
||||||
fi
|
fi
|
||||||
${Q}COMMON_COMMIT=$$(git merge-base HEAD ${BASE_COMMIT}); \
|
${Q}COMMON_COMMIT=$$(git merge-base HEAD ${BASE_COMMIT}); \
|
||||||
for commit in `git rev-list $$COMMON_COMMIT..HEAD`; do \
|
for commit in `git rev-list --no-merges $$COMMON_COMMIT..HEAD`; \
|
||||||
|
do \
|
||||||
printf "\n[*] Checking style of '$$commit'\n\n"; \
|
printf "\n[*] Checking style of '$$commit'\n\n"; \
|
||||||
git log --format=email "$$commit~..$$commit" \
|
git log --format=email "$$commit~..$$commit" \
|
||||||
-- ${CHECK_PATHS} | \
|
-- ${CHECK_PATHS} | \
|
||||||
|
|
Loading…
Reference in New Issue