From owner-svn-src-head@freebsd.org  Mon Jul 17 17:36:05 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A06BDD9B742;
 Mon, 17 Jul 2017 17:36:05 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6E71368FF1;
 Mon, 17 Jul 2017 17:36:05 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6HHa46V064987;
 Mon, 17 Jul 2017 17:36:04 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6HHa403064986;
 Mon, 17 Jul 2017 17:36:04 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201707171736.v6HHa403064986@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 17 Jul 2017 17:36:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321076 - head/usr.bin/diff
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: head/usr.bin/diff
X-SVN-Commit-Revision: 321076
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
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: Mon, 17 Jul 2017 17:36:05 -0000

Author: ngie
Date: Mon Jul 17 17:36:04 2017
New Revision: 321076
URL: https://svnweb.freebsd.org/changeset/base/321076

Log:
  Don't emit "diff: diff <options> arguments" when diffing files if
  -q is specified.
  
  This improves compatibility with GNU diff.
  
  Found by accident with `diff -Nrq /usr/tests /usr/tests.new | grep Kyuafile`.
  
  MFC after:	2 months
  Relnotes:	yes

Modified:
  head/usr.bin/diff/diffreg.c

Modified: head/usr.bin/diff/diffreg.c
==============================================================================
--- head/usr.bin/diff/diffreg.c	Mon Jul 17 16:59:22 2017	(r321075)
+++ head/usr.bin/diff/diffreg.c	Mon Jul 17 17:36:04 2017	(r321076)
@@ -1115,7 +1115,7 @@ restart:
 		return;
 	}
 proceed:
-	if (*pflags & D_HEADER) {
+	if (*pflags & D_HEADER && diff_format != D_BRIEF) {
 		diff_output("%s %s %s\n", diffargs, file1, file2);
 		*pflags &= ~D_HEADER;
 	}