From 54f0db79ca11d08a448e45cfcb6e4304c6d16014 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Tue, 16 Oct 2007 04:08:14 -0400 Subject: [PATCH] git-cvsexportcommit.perl: git-apply no longer needs --binary Signed-off-by: Michael Witten Signed-off-by: Shawn O. Pearce --- git-cvsexportcommit.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index 6b0123c75f..7a955d4530 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;