aboutsummaryrefslogtreecommitdiff
path: root/git-cvsexportcommit.perl
diff options
context:
space:
mode:
authorYann Dirson <ydirson@altern.org>2006-05-27 18:39:31 +0200
committerJunio C Hamano <junkio@cox.net>2006-05-28 09:46:07 -0700
commitff4a9ceb971cc9a296bac3a021b945b3c97e4cbe (patch)
tree368b0154ce4e6d102131f11fab39dc2252566c7f /git-cvsexportcommit.perl
parent508d9e372e0e3cfa55a6224eca5e214364fc66b4 (diff)
downloadgit-ff4a9ceb971cc9a296bac3a021b945b3c97e4cbe.tar.gz
git-ff4a9ceb971cc9a296bac3a021b945b3c97e4cbe.tar.xz
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>
Diffstat (limited to 'git-cvsexportcommit.perl')
-rwxr-xr-xgit-cvsexportcommit.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index f994443c6..ed87dc9e8 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;