kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

cvsexportcommit -p : fix the usage of git-apply -C. 

Unlike 'patch --fuzz=NUM', which specifies the number of lines allowed
to mismatch, 'git-apply -CNUM' requests the match of NUM lines of
context.  Omitting -C requests full context match, and that's what
should be used for cvsexportcommit -p.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Tomash Brechko 2007-04-09 15:24:02 +04:00 committed by Junio C Hamano
parent 24c64d6add
commit fc1f458c35
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-cvsexportcommit.perl
View File

@ -124,12 +124,17 @@ close MSG;
`git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff"; `git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff";


## apply non-binary changes ## apply non-binary changes
my $fuzz = $opt_p ? 0 : 2;
# In pedantic mode require all lines of context to match. In normal
# mode, be compatible with diff/patch: assume 3 lines of context and
# require at least one line match, i.e. ignore at most 2 lines of
# context, like diff/patch do by default.
my $context = $opt_p ? '' : '-C1';


print "Checking if patch will apply\n"; print "Checking if patch will apply\n";


my @stat; my @stat;
open APPLY, "GIT_DIR= git-apply -C$fuzz --binary --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch"; open APPLY, "GIT_DIR= git-apply $context --binary --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);
@ -196,7 +201,7 @@ if ($dirty) {
} }


print "Applying\n"; print "Applying\n";
`GIT_DIR= git-apply -C$fuzz --binary --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch"; `GIT_DIR= git-apply $context --binary --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;