system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-07 17:10:36 +00:00
Code Issues 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:
Mark Johnston 2020-01-14 15:35:03 +00:00
parent efdba95d62
commit 7dddaa0979
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=356731
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; goto closem;
} }
if (diff_format == D_BRIEF) { if (diff_format == D_BRIEF && ignore_pats == NULL) {
rval = D_DIFFER; rval = D_DIFFER;
status |= 1; status |= 1;
goto closem; goto closem;