git-cvsexportcommit.perl: git-apply no longer needs --binary

Signed-off-by: Michael Witten <mfwitten@mit.edu>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index 6b0123c75f261744324e678ef76fcc8778a606fc..7a955d4530611674c1d6650ce00dd4ff65cf15bc 100755 (executable)
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -129,7 +129,7 @@
 print "Checking if patch will apply\n";
 
 my @stat;
 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);
 @stat=<APPLY>;
 close APPLY || die "Cannot patch";
 my (@bfiles,@files,@afiles,@dfiles);


@@ -215,7 +215,7 @@
 }
 
 print "Applying\n";
 }
 
 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;
 
 print "Patch applied successfully. Adding new files and directories to CVS\n";
 my $dirtypatch = 0;