From owner-svn-src-all@freebsd.org Tue Apr 28 12:55:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D616E2B89CC; Tue, 28 Apr 2020 12:55:48 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49BM845Jp7z3BvP; Tue, 28 Apr 2020 12:55:48 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1354) id AAE7C14C2A; Tue, 28 Apr 2020 12:55:48 +0000 (UTC) From: Jan Beich To: Gary Jennejohn Cc: Kyle Evans , svn-src-head , svn-src-all , src-committers Subject: Re: svn commit: r360125 - in head/usr.bin/diff: . tests References: <202004201614.03KGEitC073880@repo.freebsd.org> <20200428144255.1b75d9b5@ernst.home> Date: Tue, 28 Apr 2020 14:55:44 +0200 In-Reply-To: <20200428144255.1b75d9b5@ernst.home> (Gary Jennejohn's message of "Tue, 28 Apr 2020 14:42:55 +0200") Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2020 12:55:48 -0000 Gary Jennejohn writes: > On Tue, 28 Apr 2020 07:25:18 -0500 > Kyle Evans wrote: > >> On Tue, Apr 28, 2020 at 6:52 AM Jan Beich wrote: >> > >> > Kyle Evans writes: >> > >> > > Author: kevans >> > > Date: Mon Apr 20 16:14:44 2020 >> > > New Revision: 360125 >> > > URL: https://svnweb.freebsd.org/changeset/base/360125 >> > > >> > > Log: >> > > diff(1): reject conflicting formatting options >> > > >> > > This matches GNU diff(1) behavior and, more importantly, eliminates any >> > > source of confusion if multiple formatting options are specified. >> > > >> > > Note that the committed diff differs slightly from the submitted: I've >> > > modified it so that we initialize diff_format to something that isn't an >> > > accepted format option so that we can also reject --normal -c and -c >> > > --normal, which would've otherwise been accepted because the default was >> > > --normal. After option parsing we default it to D_NORMAL if it's still >> > > unset. >> > > >> > > PR: 243975 >> > > Submitted by: fehmi noyan isi >> > > MFC after: 1 week >> > >> > Appears to break ability to specify number of context lines e.g., >> > >> > $ diff -U999 /usr/include/sha256.h /usr/include/sha512.h >> > error: conflicting output format options. >> > usage: diff [-aBbdilpTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case] >> > [...] >> >> Hmm, bizarre. =-\ This example works on my machine, and I don't see >> off-hand what would be preventing it for you: >> >> root@viper:/usr/src/usr.bin/diff# diff -U999 /usr/include/sha256.h >> /usr/include/sha512.h >> --- /usr/include/sha256.h 2020-04-22 21:38:54.000000000 -0500 >> +++ /usr/include/sha512.h 2020-04-22 21:38:54.000000000 -0500 >> @@ -1,99 +1,99 @@ >> /*- >> * Copyright 2005 Colin Percival >> * All rights reserved. >> * >> [... omitted ...] >> >> root@viper:/usr/src/usr.bin/diff# strings /usr/bin/diff | grep 'conflicting' >> error: conflicting output format options. >> > > My /usr/bin/diff was built and installed on April 26, after this > commit, and I don't see the error either. Thanks for confirming. Looks like my "diff" was aliased to "diff -up". Indeed, -u and -U are no longer compatible unlike GNU diff.