From: Yann Dirson <ydirson@altern.org>
Date: Sat, 27 May 2006 16:39:31 +0000 (+0200)
Subject: Do not call 'cmp' with non-existant -q flag.
X-Git-Tag: v1.4.0-rc1~56
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ff4a9ceb971cc9a296bac3a021b945b3c97e4cbe;hp=508d9e372e0e3cfa55a6224eca5e214364fc66b4;p=git.git

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>
---

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index f994443c..ed87dc9e 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -151,7 +151,7 @@ foreach my $f (@bfiles) {
     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;