git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Michael Witten <mfwitten@mit.edu>
To: git@vger.kernel.org
Cc: Michael Witten <mfwitten@mit.edu>
Subject: [PATCH 3/3] git-cvsexportcommit.perl: git-apply no longer needs --binary
Date: Tue, 16 Oct 2007 04:08:14 -0400	[thread overview]
Message-ID: <1192522094-4988-3-git-send-email-mfwitten@mit.edu> (raw)
In-Reply-To: <1192522094-4988-2-git-send-email-mfwitten@mit.edu>

Signed-off-by: Michael Witten <mfwitten@mit.edu>
---
 git-cvsexportcommit.perl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index 869c8b5..22c3d2f 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -129,7 +129,7 @@ my $context = $opt_p ? '' : '-C1';
 print "Checking if patch will apply\n";
 
 my @stat;
-open APPLY, "GIT_DIR= git-apply $context --binary --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch";
+open APPLY, "GIT_DIR= git-apply $context --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch";
 @stat=<APPLY>;
 close APPLY || die "Cannot patch";
 my (@bfiles,@files,@afiles,@dfiles);
@@ -215,7 +215,7 @@ if ($dirty) {
 }
 
 print "Applying\n";
-`GIT_DIR= git-apply $context --binary --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch";
+`GIT_DIR= git-apply $context --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch";
 
 print "Patch applied successfully. Adding new files and directories to CVS\n";
 my $dirtypatch = 0;
-- 
1.5.3.4.207.g6d7480-dirty

  reply	other threads:[~2007-10-16  9:56 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-16  8:08 [PATCH 1/3] git-cvsexportcommit.perl tabified Michael Witten
2007-10-16  8:08 ` [PATCH 2/3] git-cvsexportcommit.perl tmpdir removed Michael Witten
2007-10-16  8:08   ` Michael Witten [this message]
2007-10-16 13:04     ` [PATCH 3/3] git-cvsexportcommit.perl: git-apply no longer needs --binary Johannes Schindelin
2007-10-16 15:27       ` Michael Witten
2007-10-16 21:20         ` Robin Rosenberg
2007-10-16 22:13           ` Michael Witten
2007-10-16 22:49             ` Johannes Schindelin
2007-10-16 23:22               ` Michael Witten
2007-10-17  1:11             ` Shawn O. Pearce
2007-10-17  1:34               ` Michael Witten
2007-10-20 13:59                 ` Robin Rosenberg
2007-10-17  2:25   ` [PATCH 2/3] git-cvsexportcommit.perl tmpdir removed Shawn O. Pearce

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1192522094-4988-3-git-send-email-mfwitten@mit.edu \
    --to=mfwitten@mit.edu \
    --cc=git@vger.kernel.org \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).