X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-cvsexportcommit.perl;h=ed87dc9e8736e59ac023e1be6ac0af9f056818ea;hb=ff4a9ceb971cc9a296bac3a021b945b3c97e4cbe;hp=f994443c6fa16257b9b6a44abfc999d2ed25e601;hpb=508d9e372e0e3cfa55a6224eca5e214364fc66b4;p=git.git 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;