From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Feb 2019 22:27:42 +0000 (+0900)
Subject: Reintegrate: teach 'On hold' status
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=322e6dc209fe4446ef00cb2ec3fd04f4467ce01a;p=thirdparty%2Fgit.git

Reintegrate: teach 'On hold' status
---

diff --git a/Reintegrate b/Reintegrate
index 883ecd77e5..aa12b7b9f4 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -32,12 +32,13 @@ done
 annotate_merge () {
 	test -f Meta/whats-cooking.txt || return 0
 
+	# NEEDSWORK: unify with cook::wildo_match
 	perl -e '
 		sub wildo_match {
 			s/^\s*//;
 			if (/^Will (?:\S+ ){0,2}(fast-track|hold|keep|merge|drop|discard|cook|kick|defer|eject|be re-?rolled|wait)[,. ]/ ||
 			    /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
-			    /^Can wait in / || /^Still / || /^Stuck / ||
+			    /^Can wait in / || /^Still / || /^Stuck / || /^On hold/ ||
 			    /^Needs? / || /^Expecting / || /^May want to /) {
 				return 1;
 			}