Skip to content

Commit

Permalink
git-cvsexportcommit.perl: git-apply no longer needs --binary
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Witten <mfwitten@mit.edu>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
  • Loading branch information
Michael Witten authored and Shawn O. Pearce committed Oct 17, 2007
1 parent fd499bc commit 54f0db7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-cvsexportcommit.perl
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
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);
Expand Down Expand Up @@ -215,7 +215,7 @@
}

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;
Expand Down

0 comments on commit 54f0db7

Please sign in to comment.