From: Michael Witten Date: Tue, 16 Oct 2007 08:08:14 GMT Subject: [PATCH 3/3] git-cvsexportcommit.perl: git-apply no longer needs --binary Message-ID: <1192522094-4988-3-git-send-email-mfwitten@mit.edu> In-Reply-To: <1192522094-4988-2-git-send-email-mfwitten@mit.edu> Signed-off-by: Michael Witten --- 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=; 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