1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-28 18:35:11 +02:00

Do not call 'cmp' with non-existant -q flag.

I cannot find when that flag was removed if it ever existed, I can find
nothing about it in the ChangeLog and NEWS file of GNU diff.  The current
flag is -s aka --quiet aka --silent, so let's use -s, assuming it is a
portable flag.  Feel free to lart me with a POSIX bible if needed.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Yann Dirson 2006-05-27 18:39:31 +02:00 committed by Junio C Hamano
parent 508d9e372e
commit ff4a9ceb97

View File

@ -151,7 +151,7 @@
my $blob = `git-ls-tree $tree "$f" | cut -f 1 | cut -d ' ' -f 3`;
chomp $blob;
`git-cat-file blob $blob > $tmpdir/blob`;
if (system('cmp', '-q', $f, "$tmpdir/blob")) {
if (system('cmp', '-s', $f, "$tmpdir/blob")) {
warn "Binary file $f in CVS does not match parent.\n";
$dirty = 1;
next;