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
@@ -177,8 +177,17 @@ no)
177
else
178
rm -f contrib/coccinelle/*.patch
179
Meta/Make -j8 coccicheck
180
- cat contrib/coccinelle/*.patch | git apply --index ||
181
- exit
180
+ if grep coccicheck-pending Makefile >/dev/null
181
+ then
182
+ Meta/Make -j8 coccicheck-pending
183
+ fi
184
+ cat contrib/coccinelle/*.patch >cocci.patch
185
+ if ! test -s cocci.patch
186
+ then
187
+ exit 0
188
+ fi
189
+ git apply --index -3 cocci.patch || exit
190
+ rm cocci.patch
191
git diff --quiet HEAD && continue
192
fi
193
git commit -m "$cocci_mark" || exit