Date: Tue, 28 Apr 2020 13:52:31 +0200 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 Message-ID: <blnb-969s-wny@FreeBSD.org> In-Reply-To: <202004201614.03KGEitC073880@repo.freebsd.org> (Kyle Evans's message of "Mon, 20 Apr 2020 16:14:44 %2B0000 (UTC)") References: <202004201614.03KGEitC073880@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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] [...]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?blnb-969s-wny>