Reintegrate: check coccicheck-pending, too
Junio C Hamano committed
Mar 1, 2019 at 07:28 UTC
1bc963bf8c90fde7b34866fc899412d9985299c0
1 file changed
+11
-2
Reintegrate
+11
-2
index aa12b7b9f4..2c59e4d129 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -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