From ff4a9ceb971cc9a296bac3a021b945b3c97e4cbe Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Sat, 27 May 2006 18:39:31 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-cvsexportcommit.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index f994443c6f..ed87dc9e87 100755 --- a/git-cvsexportcommit.perl +++ b/git-cvsexportcommit.perl @@ -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;