mirror of
https://github.com/git/git.git
synced 2024-05-11 18:16:29 +02:00
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>
This commit is contained in:
parent
fd499bcc9d
commit
54f0db79ca
|
@ -129,7 +129,7 @@
|
||||||
print "Checking if patch will apply\n";
|
print "Checking if patch will apply\n";
|
||||||
|
|
||||||
my @stat;
|
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>;
|
@stat=<APPLY>;
|
||||||
close APPLY || die "Cannot patch";
|
close APPLY || die "Cannot patch";
|
||||||
my (@bfiles,@files,@afiles,@dfiles);
|
my (@bfiles,@files,@afiles,@dfiles);
|
||||||
|
@ -215,7 +215,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
print "Applying\n";
|
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";
|
print "Patch applied successfully. Adding new files and directories to CVS\n";
|
||||||
my $dirtypatch = 0;
|
my $dirtypatch = 0;
|
||||||
|
|
Loading…
Reference in New Issue