From 041c8c4c5d451a6bc6db73419fd5ffca3d09231f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 21 Feb 2018 21:00:23 -0500 Subject: [PATCH] * admin/automerge (merge): Report no. of commits if too few. --- admin/automerge | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/admin/automerge b/admin/automerge index 76c1596f3fa..ba608d10904 100755 --- a/admin/automerge +++ b/admin/automerge @@ -161,10 +161,8 @@ merge () return 0 else - grep -qE "Nothing to merge|Number of missing commits" $tempfile && { - echo "Fewer than $nmin commits to merge" + grep -E "Nothing to merge|Number of missing commits" $tempfile && \ exit 0 - } cat "$tempfile" 1>&2 -- 2.39.2