From nobody Thu Mar 2 23:59:28 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 4PSSkm4w3Yz3wQ9V; Thu, 2 Mar 2023 23:59:28 +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 4PSSkm2hx4z4L3W; Thu, 2 Mar 2023 23:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677801568; 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=tcNDS4FEmVKtobbPxCt8fP+JDMB/FTAJ4GpeUBU6VYM=; b=WCu4IbnKw2rMG4oQKnOz6o+DbqVGm9JzzS5PozePbDfBG9LNBbUk5LG1aTdvlOiB/cohvh 11UW3en9CzKJV8BePC97wsbzlO8Pzf3mTFlkOaJOyJ+ntWsO6tiOBkqTm2aahdynkdQgzN F7sIGUwyFL/kc+0e1sOmEqNIt0fhGQZyE29ZeqXO32yPtwuolbpu8C4rxjOSZj4i2fuJ2s 0LOmoeddG2F6VAsotEx5m8Za5BlUAlyAyDZiJbd4+gUF8lM4Dp3CYjg4OEWRK5AjS+a+Hb 7lD0gv1KnSd9opXRy4JPIOa12PicE3t3AoRj17EvUVt9mEEJfMjXS/z9yzGhKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677801568; 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=tcNDS4FEmVKtobbPxCt8fP+JDMB/FTAJ4GpeUBU6VYM=; b=L4KK3NStG/7nppsS3lyABfGxGDJqbED0Omx2FbDfUqor3hKkeb5mYl2JRfuW3VJVelPWiy A6KFPAl/zymoaCXiJ+US6gh/aonsY+xJvUvugXiy4hANP72ORQvPZ83tJtaVEFee/pKTAz 8pNOFyG0nMMzd+qlVe7XBF3MRFpK3M+4Ji2Se1gV2Dikz4LUeV9y1t/iE6JBJBIkvzrMos ahi016j9WNTxzsfpkLSYAMwaLCGR0q+M2tatD+uu7Gvq8Qa9vOk5CrsL12/4TC4r7mTDba Tzh+/33aUVSN90hMSOpUthLx15MPgWYI4kJgA7lx+68Q/jH1zybUwRxw+gwCBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677801568; a=rsa-sha256; cv=none; b=l+uGqH8Fw1z+WJBOtyG5tLTjdUnFl+SlGn9XPBN7Qnbu26EyvyjXTA+7hKTcjkIFb/nfHP 1C/v9Mc/C+M/6zjGzMYT8x2zkFcgA9czD61mvHB4VjmvYxbH9dlqVktwF3PdXDCnOnQCjK uhNL0qiy8yf6hJYWzAQjM0czpDzDUpET4yttg7uoKM7gMfHzh6cCdeE3RUhHHH4CNaPQgs t/4441AgmlJaTbhli1YZFpN84XbkDBKQegHF/aObZWDhHr3XyT8PHqElj/T7qQhfstvI6L ljEsulc3Q4iXOAmubpjyvX2w5xyid+93vCLcM9x7mTB3vEa3MYJS5a5aVmdPoQ== 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 4PSSkm1jWHzcDN; Thu, 2 Mar 2023 23:59:28 +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 322NxSl7093129; Thu, 2 Mar 2023 23:59:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322NxSsO093128; Thu, 2 Mar 2023 23:59:28 GMT (envelope-from git) Date: Thu, 2 Mar 2023 23:59:28 GMT Message-Id: <202303022359.322NxSsO093128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e27ded83c76a - main - 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/main X-Git-Reftype: branch X-Git-Commit: e27ded83c76a609687a3d9e82b80fe7e1b782bf6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e27ded83c76a609687a3d9e82b80fe7e1b782bf6 commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6 Author: Ed Maste AuthorDate: 2023-03-02 23:54:52 +0000 Commit: Ed Maste CommitDate: 2023-03-02 23:58:58 +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 --- 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