d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not skip line-by-line comparison if -q and -I are specified.

Browse Source 
This fixes a regression from r356695.

Submitted by:	kevans
Reported by:	Jenkins via lwhsu
MFC after:	6 days
This commit is contained in:
markj 2020-01-14 15:35:03 +00:00
parent 650da643c8
commit 557b058809
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/diff/diffreg.c
View File

@ -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;