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;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
