From nobody Mon Mar 6 13:03:27 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 4PVdzz6tB1z3wstF; Mon, 6 Mar 2023 13:03:27 +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 4PVdzz6GSPz3GDf; Mon, 6 Mar 2023 13:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107807; 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=voQm4OLTFAOaCnsq/xR3Y0D9+4bHN3w0Mo5cvvuKZ+0=; b=fg9uWekRwhWsQpxSqpWbkOGteGBJbjf+PLLPh8wiQGi/bdwyrSfraH4ZTWNzCS9addKl/F kXTxQOP5ZY5yITGJwRsXWHAibPNxYwvtkTxhIfAwsRYzh8qr2w+4ArWAR+UrTOygiIqDMN n5U9WOCZyOiTgreKgXb/D+n1bHywNb49cz5HDTfO2MHN4bdS+fonzAi8vIntcRzeyFIZqb xBX6LA3qGK3amJfzaPGvOdHR342W6PjfrHqxDCspuMOOeS0Qjvf3s6lSzgFLvCA3LRNu+1 rU2ZViAFThWJUgQ5q1r7OGq0wgjvt2D6M4ptTE2Zp4tpE0PMO1dPXS1Lqhvw+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107807; 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=voQm4OLTFAOaCnsq/xR3Y0D9+4bHN3w0Mo5cvvuKZ+0=; b=U+K5snqgG6oSrzvpXv0q8xzdTke2ByGhbDm3rFxb8PssfuNl7gbovK/dlLGgk9KN3rQ9NG WG0jfxrpgE7BKSRE/Zy4BJSD8vJyFZ713GHcXmQuo6cSry5j20U6G9i3cx3Ai9v2pMqfIH epNviHXG7rnHp3prtgbWYb084lCsm/zmevxSXFmkDOM+QTRp3z/1g17cs767Rr+LhXypMK Tz9QMIl/5e4ELtGMcCYagWCYXW+mNh3+EEKD89nIwPiiu/S0IxfFC/FwdT3LpWFukeiSEO 5XtFSHMxnGvVr0bHM+JAdYa7za7XhJLSo1UgLQ0xWU3MMEDsFXoh2kYr0Irs5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678107807; a=rsa-sha256; cv=none; b=OyuooYLtSmOm8ZLkeNl3Vn41V6rULaSArFf1hEgh5GrGZi/3EYx6UMCe4bp6uj46pg1Wyd 9ZXFFTerCTuKxOrlHSZdh0OH0+Rl1Mll/rF9pPlKx5el0ejw0XXw63JnqoanSdecnQcP+8 0PBRzepweYTKVPwAZfqg3BHx89++QD4vW5cbtDS6ahRg8octnH1JdAgTpdif3JVRN8esmO QtqdrncuD5mrj1euRCX08wVkrphGRc0DyWFSqFN2hHUJ+/AUCQ3yexBSp42bP9S5jPYc7y opyBAcQuEacxkFwYNVQ/L0R0bl7H+bH+Jrhf1Ngl1C0v1C3D1aCD/dzCQrwWjg== 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 4PVdzz55PGz134s; Mon, 6 Mar 2023 13:03:27 +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 326D3RNS078884; Mon, 6 Mar 2023 13:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326D3RrP078883; Mon, 6 Mar 2023 13:03:27 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:03:27 GMT Message-Id: <202303061303.326D3RrP078883@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: 46a79e80414c - releng/13.2 - 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 46a79e80414cdf9830c3afc402f3e4a6c24df6e9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=46a79e80414cdf9830c3afc402f3e4a6c24df6e9 commit 46a79e80414cdf9830c3afc402f3e4a6c24df6e9 Author: Ed Maste AuthorDate: 2023-03-02 23:54:52 +0000 Commit: Ed Maste CommitDate: 2023-03-06 13:02:51 +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 Approved by: re (cperciva) Sponsored by: The FreeBSD Foundation (cherry picked from commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6) (cherry picked from commit b562307b70346030f59fe6a05d125814c74da47b) --- 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