Don't emit "diff: diff <options> arguments" when diffing files if
-q is specified. This improves compatibility with GNU diff. Found by accident with `diff -Nrq /usr/tests /usr/tests.new | grep Kyuafile`. MFC after: 2 months Relnotes: yes
This commit is contained in:
parent
a9d5e2394e
commit
e066de4be4
@ -1115,7 +1115,7 @@ change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d,
|
||||
return;
|
||||
}
|
||||
proceed:
|
||||
if (*pflags & D_HEADER) {
|
||||
if (*pflags & D_HEADER && diff_format != D_BRIEF) {
|
||||
diff_output("%s %s %s\n", diffargs, file1, file2);
|
||||
*pflags &= ~D_HEADER;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user