From owner-svn-src-all@freebsd.org  Tue Jan 14 15:35:04 2020
Return-Path: <owner-svn-src-all@freebsd.org>
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 37A3F1EEC00;
 Tue, 14 Jan 2020 15:35:04 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (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 "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47xvfJ0gNCz4Hgk;
 Tue, 14 Jan 2020 15:35:04 +0000 (UTC)
 (envelope-from markj@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0DE7B1FD0C;
 Tue, 14 Jan 2020 15:35:04 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00EFZ3F2084315;
 Tue, 14 Jan 2020 15:35:03 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00EFZ3PK084314;
 Tue, 14 Jan 2020 15:35:03 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <202001141535.00EFZ3PK084314@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 14 Jan 2020 15:35:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r356731 - head/usr.bin/diff
X-SVN-Group: head
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: head/usr.bin/diff
X-SVN-Commit-Revision: 356731
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2020 15:35:04 -0000

Author: markj
Date: Tue Jan 14 15:35:03 2020
New Revision: 356731
URL: https://svnweb.freebsd.org/changeset/base/356731

Log:
  Do not skip line-by-line comparison if -q and -I are specified.
  
  This fixes a regression from r356695.
  
  Submitted by:	kevans
  Reported by:	Jenkins via lwhsu
  MFC after:	6 days

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

Modified: head/usr.bin/diff/diffreg.c
==============================================================================
--- head/usr.bin/diff/diffreg.c	Tue Jan 14 13:20:16 2020	(r356730)
+++ head/usr.bin/diff/diffreg.c	Tue Jan 14 15:35:03 2020	(r356731)
@@ -349,7 +349,7 @@ diffreg(char *file1, char *file2, int flags, int capsi
 		goto closem;
 	}
 
-	if (diff_format == D_BRIEF) {
+	if (diff_format == D_BRIEF && ignore_pats == NULL) {
 		rval = D_DIFFER;
 		status |= 1;
 		goto closem;