From nobody Thu Mar 2 23:54:26 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 4PSSd96zzSz3wPmd; Thu, 2 Mar 2023 23:54:37 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSSd94tWXz4Kht; Thu, 2 Mar 2023 23:54:37 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f41.google.com with SMTP id g17so1460981lfv.4; Thu, 02 Mar 2023 15:54:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677801275; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ym3uzqb1gmy5dQbW7VPtVn4qVC1OL2UUKxmM5vGzD5Y=; b=VcsxpEW0eSDkoeln4XZ6+z5oHuB9e4JyP9UYJ3MhXth+eU+se0VWM8qgaxf3u5uQyB f/o99xyfboc19utPCHdMrjRwL20xhcHaiDK/z5oUO6h94W+8pQZhIjJLvbyDbWWDmpqw 5kHpYQd1UQEl/6rBaJnkElixIVmVc8MxjZrUNlaxeEXqs5Ii6e2r6LsGMSgLU4hm/NsJ IORrvha1o2MAUfyECtkrXMf0X1ONjIIN0STWgVFBeJC5bChLAhXJLhdqQKZPwZd4rY90 lVQuUV55fMWjqBI4wGLkvph1IYD0QXtDqZ9Ndoa04A0MBpkQV/VkIJQc0CVS2bW+c/C3 y1/Q== X-Gm-Message-State: AO0yUKXxOz0xNJyyN/8zklsltJedC2wFs1eDIAYIlwnVr1fQ+Hj5rT6X 2DtNprRm26mNmU2rTKDB4ED/DCPKwKzjyEswgN3NfMjUM+4= X-Google-Smtp-Source: AK7set8fv0p0KUJHwYd2SB46+O92FRHKylVjgM3Fa6BPG8zfzKoZ0DrzFbHHV0+swCZ+TxlB7ICaJetxz2fa+gbFF3s= X-Received: by 2002:ac2:4255:0:b0:4db:257b:f605 with SMTP id m21-20020ac24255000000b004db257bf605mr22621lfl.2.1677801275553; Thu, 02 Mar 2023 15:54:35 -0800 (PST) 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 References: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu> In-Reply-To: From: Ed Maste Date: Thu, 2 Mar 2023 18:54:26 -0500 Message-ID: Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain To: Warner Losh Cc: Kyle Evans , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Steffen Nurpmeso Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4PSSd94tWXz4Kht X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Thu, 2 Mar 2023 at 15:37, Warner Losh wrote: > > I doubt egrep will ever be deprecated. Too many scripts depend on it. > And fixing this one is a drop in the bucket. I personally think the warning > from gnu-grep is bananas... Agreed on both points. In the man page we have: -E, --extended-regexp Interpret pattern as an extended regular expression (i.e., force grep to behave as egrep). That said, it's conceivable that this could end up invoking GNU egrep and thus emit a warning. It doesn't hurt to use grep -E instead.