Reintegrate: check coccicheck-pending, too

diff --git a/Reintegrate b/Reintegrate
index aa12b7b9f422fa556fc40230bb97e3465ee40112..2c59e4d1296fd6c24475b997f2903e207fc973ed 100755 (executable)
--- 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