mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-07 17:10:36 +00:00
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
This commit is contained in:
parent
efdba95d62
commit
7dddaa0979
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=356731
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue