From: Yann Dirson Date: Sat, 27 May 2006 16:39:31 GMT Subject: [PATCH 1/3] Do not call 'cmp' with non-existant -q flag. Message-ID: <20060527163931.474.19611.stgit@gandelf.nowhere.earth> In-Reply-To: <20060527163641.474.93575.stgit@gandelf.nowhere.earth> 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 --- git-cvsexportcommit.perl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index f994443..ed87dc9 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;