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>
Michael Witten committed
Oct 16, 2007 at 04:08 UTC
54f0db79ca11d08a448e45cfcb6e4304c6d16014
1 file changed
+2
-2
git-cvsexportcommit.perl
+2
-2
@@ -129,7 +129,7 @@ my $context = $opt_p ? '' : '-C1';
129
print "Checking if patch will apply\n";
130
131
my @stat;
132
-open APPLY, "GIT_DIR= git-apply $context --binary --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch";
132
+open APPLY, "GIT_DIR= git-apply $context --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch";
133
@stat=<APPLY>;
134
close APPLY || die "Cannot patch";
135
my (@bfiles,@files,@afiles,@dfiles);
@@ -215,7 +215,7 @@ if ($dirty) {
215
}
216
217
print "Applying\n";
218
-`GIT_DIR= git-apply $context --binary --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch";
218
+`GIT_DIR= git-apply $context --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch";
219
220
print "Patch applied successfully. Adding new files and directories to CVS\n";
221
my $dirtypatch = 0;