From: Yann Dirson <ydirson@altern.org>
To: junkio@cox.net
Cc: git@vger.kernel.org
Subject: [PATCH 1/3] Do not call 'cmp' with non-existant -q flag.
Date: Sat, 27 May 2006 18:39:31 +0200 [thread overview]
Message-ID: <20060527163931.474.19611.stgit@gandelf.nowhere.earth> (raw)
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 <ydirson@altern.org>
---
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;
next prev parent reply other threads:[~2006-05-27 16:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-27 16:36 [PATCH 0/3] Handful of cvsexportcommit patches Yann Dirson
2006-05-27 16:39 ` Yann Dirson [this message]
2006-05-27 16:39 ` [PATCH 2/3] Document current cvsps limitations Yann Dirson
2006-05-27 19:13 ` Yann Dirson
2006-05-27 16:39 ` [PATCH 3/3] Make cvsexportcommit create parent directories as needed Yann Dirson
2006-06-17 17:46 ` [PATCH] git-cvsexportcommit.perl: fix typo Sven Verdoolaege
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060527163931.474.19611.stgit@gandelf.nowhere.earth \
--to=ydirson@altern.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).