From: Glenn Morris Date: Thu, 22 Feb 2018 02:00:23 +0000 (-0500) Subject: * admin/automerge (merge): Report no. of commits if too few. X-Git-Tag: emacs-27.0.90~5646 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=041c8c4c5d451a6bc6db73419fd5ffca3d09231f;p=emacs.git * admin/automerge (merge): Report no. of commits if too few. --- 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