From owner-svn-src-head@freebsd.org  Tue Apr 28 11:52:35 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 17C152B622B;
 Tue, 28 Apr 2020 11:52:35 +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 49BKl66q1Xz4c0F;
 Tue, 28 Apr 2020 11:52:34 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1354)
 id E242B13EAF; Tue, 28 Apr 2020 11:52:34 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: Kyle Evans <kevans@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: Re: svn commit: r360125 - in head/usr.bin/diff: . tests
References: <202004201614.03KGEitC073880@repo.freebsd.org>
Date: Tue, 28 Apr 2020 13:52:31 +0200
In-Reply-To: <202004201614.03KGEitC073880@repo.freebsd.org> (Kyle Evans's
 message of "Mon, 20 Apr 2020 16:14:44 +0000 (UTC)")
Message-ID: <blnb-969s-wny@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Apr 2020 11:52:35 -0000

Kyle Evans <kevans@FreeBSD.org> 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]
[...]