X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-cvsexportcommit.perl;fp=git-cvsexportcommit.perl;h=f284c88a46b5cc7d6e75b78346829ce03e60b060;hb=f5bf6feb05b8c89c448ded6e6fad0eb58ef35463;hp=7b19a33ad1cceaf61793be4e16e4b144d415a975;hpb=bbaf63f2f18242484868d6c03d5df9bd071d6deb;p=git.git

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index 7b19a33ad..f284c88a4 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -30,11 +30,6 @@ if ($opt_d) {
 	@cvs = ('cvs');
 }
 
-# setup a tempdir
-our ($tmpdir, $tmpdirname) = tempdir('git-cvsapplycommit-XXXXXX',
-				     TMPDIR => 1,
-				     CLEANUP => 1);
-
 # resolve target commit
 my $commit;
 $commit = pop @ARGV;
@@ -134,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);
@@ -220,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;