From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Feb 2019 22:28:15 +0000 (+0900)
Subject: Reintegrate: check coccicheck-pending, too
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bc963bf8c90fde7b34866fc899412d9985299c0;p=thirdparty%2Fgit.git

Reintegrate: check coccicheck-pending, too
---

diff --git a/Reintegrate b/Reintegrate
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