Skip to content

Commit 54f0db7

Browse files
Michael Wittenspearce
authored andcommitted
git-cvsexportcommit.perl: git-apply no longer needs --binary
Signed-off-by: Michael Witten <[email protected]> Signed-off-by: Shawn O. Pearce <[email protected]>
1 parent fd499bc commit 54f0db7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-cvsexportcommit.perl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
print "Checking if patch will apply\n";
130130

131131
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";
133133
@stat=<APPLY>;
134134
close APPLY || die "Cannot patch";
135135
my (@bfiles,@files,@afiles,@dfiles);
@@ -215,7 +215,7 @@
215215
}
216216

217217
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";
219219

220220
print "Patch applied successfully. Adding new files and directories to CVS\n";
221221
my $dirtypatch = 0;

0 commit comments

Comments
 (0)