Reintegrate: check coccicheck-pending, too

This commit is contained in:
Junio C Hamano
2019-03-01 07:28:15 +09:00
parent 322e6dc209
commit 1bc963bf8c

View File

@@ -177,8 +177,17 @@ no)
else
rm -f contrib/coccinelle/*.patch
Meta/Make -j8 coccicheck
cat contrib/coccinelle/*.patch | git apply --index ||
exit
if grep coccicheck-pending Makefile >/dev/null
then
Meta/Make -j8 coccicheck-pending
fi
cat contrib/coccinelle/*.patch >cocci.patch
if ! test -s cocci.patch
then
exit 0
fi
git apply --index -3 cocci.patch || exit
rm cocci.patch
git diff --quiet HEAD && continue
fi
git commit -m "$cocci_mark" || exit