diff options
| author | Michael Witten <mfwitten@mit.edu> | 2007-10-16 08:08:14 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-17 02:48:20 (GMT) |
| commit | 54f0db79ca11d08a448e45cfcb6e4304c6d16014 (patch) | |
| tree | 410900a7fa8ff87aad79d31faf751c770fe3f83c | |
| parent | fd499bcc9d749db7c2108802701f6a1195e4a958 (diff) | |
| download | git-54f0db79ca11d08a448e45cfcb6e4304c6d16014.zip git-54f0db79ca11d08a448e45cfcb6e4304c6d16014.tar.gz git-54f0db79ca11d08a448e45cfcb6e4304c6d16014.tar.bz2 | |
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>
| -rwxr-xr-x | git-cvsexportcommit.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index 6b0123c..7a955d4 100755 --- a/git-cvsexportcommit.perl +++ b/git-cvsexportcommit.perl @@ -129,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); @@ -215,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; |