From nobody Mon Mar 06 00:31:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVKJM0P5Tz3w9Mk; Mon, 6 Mar 2023 00:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVKJL6sgPz4KTc; Mon, 6 Mar 2023 00:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wb6jIMXOdcSTkP1LRUQoy2UTF8dMUqY867jWAQFV4n8=; b=hrLpTYx0rCQ3yDPu0aTUFIGpiVV6vGZ0gogs4dMNDhCni9VrNaGPKOMd3nxlh1HG0DSzZl in8CsQqW5pPCFhBHTfkyIBtb8xZAyw+OyrlhSj+/ykElLpigaWBQoWd/l9n/fr3tUnWZLt CK/S/YpA5xeabCFDHQ3rI7p66AFIrdtJw24Viot8mE5I67flEstb6i6ahNjRnNtykT432+ lXxutJfnPA4YntleXm9j6yAZyOBw3GOrFvtasdA0on1rK4Xm/ofgo1TuICjvCd8AV5bm+d cBU7NRt9zdh943gJEiNAMFLuEwz4jE5qNXpEC7NghzroRCoYS1sRZDfSu9soQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wb6jIMXOdcSTkP1LRUQoy2UTF8dMUqY867jWAQFV4n8=; b=ees41B8nNrq7PamSAv5O8OlgHas30Vlddae0FXYKVS9Jg/S6USPN5sqAWrJ5k+yQbcKRVb vLzF97ewf1YALdZLu4+6zkTnlagF/n33fhysu7eLe9JYl5wNLFKEY29KhAf6J6qg2hubaa VtRpbiAjjYaT5R6pVinoD5OPKe9fwqpSKgUgB50nxuF4i+05Yx/+5a4MuFagsSVxzF4Y8O Fyc2Z2195VgXIWuIGoDmXD3s8Am+CNqg34tFfSHBW/YYL20jU3jupbTVHEkmK4fV3e0EEH QzbO/8bKMkPispesdjZkDMI7v0XvukqjaIxKjuo8c1H+R0jv3dK3yKaB411Qzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678062691; a=rsa-sha256; cv=none; b=A5n/Ij3B3/Fn2XkpwMeJCu0WN8U80ROjiaW9oYkf2I3x3FimurTT146Rh8v6KnbvqowF1T 1ftRI6qSePiW3i0rLRpbNgObPM1ayM8LIA8TcRwPB7a304MDVVhUDcb8z4y4lhcCTlc2TR slD3kHXYVFmfRpl/iJid4I5TVfLUACb/3NXn5L/Ou+T+IEfdBAOaR3Hjg2RVd9xwE2s2ZH MPTB9C3P7q4ynMsIhwoK07OSzuC+iDU87mkEiof1vkJjdnlB0KiAb8CgjfwSCJno538MCC 0HcLqPWABgej9f+4AIyoQZaOu30YF3I46QA8dmIEFcwu87R8rm8Aln4yEQsJcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PVKJL5kbzzhMg; Mon, 6 Mar 2023 00:31:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3260VU17043782; Mon, 6 Mar 2023 00:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3260VUDN043781; Mon, 6 Mar 2023 00:31:30 GMT (envelope-from git) Date: Mon, 6 Mar 2023 00:31:30 GMT Message-Id: <202303060031.3260VUDN043781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b562307b7034 - stable/13 - freebsd-update: use grep -E instead of egrep List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b562307b70346030f59fe6a05d125814c74da47b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b562307b70346030f59fe6a05d125814c74da47b commit b562307b70346030f59fe6a05d125814c74da47b Author: Ed Maste AuthorDate: 2023-03-02 23:54:52 +0000 Commit: Ed Maste CommitDate: 2023-03-06 00:30:57 +0000 freebsd-update: use grep -E instead of egrep GNU egrep emits a warning that it is obsolescent and suggests grep -E instead. Switch to grep -E in case we end up invoking GNU (e)grep (and for consistency with other invocations in this file). Reported by: Steffen Nurpmeso Sponsored by: The FreeBSD Foundation (cherry picked from commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6) --- usr.sbin/freebsd-update/freebsd-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 225d1e31e3ec..4ef44d1ad000 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2547,7 +2547,7 @@ manually... read dummy >>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then + if ! grep -qE '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then break fi cat <<-EOF