Do not call 'cmp' with non-existant -q flag.
authorYann Dirson <ydirson@altern.org>
Sat, 27 May 2006 16:39:31 +0000 (18:39 +0200)
committerJunio C Hamano <junkio@cox.net>
Sun, 28 May 2006 16:46:07 +0000 (09:46 -0700)
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>
git-cvsexportcommit.perl
index f994443c6fa16257b9b6a44abfc999d2ed25e601..ed87dc9e8736e59ac023e1be6ac0af9f056818ea 100755 (executable)
     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;