From 7dddaa097977eec3132cbfe39ab7f04c680ebaee Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 14 Jan 2020 15:35:03 +0000
Subject: [PATCH] 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
---
 usr.bin/diff/diffreg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index 9efab1452ef3..fc63912b5ef3 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -349,7 +349,7 @@ diffreg(char *file1, char *file2, int flags, int capsicum)
 		goto closem;
 	}
 
-	if (diff_format == D_BRIEF) {
+	if (diff_format == D_BRIEF && ignore_pats == NULL) {
 		rval = D_DIFFER;
 		status |= 1;
 		goto closem;