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

git-cvsexportcommit can't handle merge commits correctly 

git-cvsexportcommit should check if the parent (supplied on the cmdline) to use
for a merge commit is one of the real parents of the merge.

But it errors out if the _first_ parent doesn't match and never checks
the other parents.

Signed-off-by: Peter Baumann <siprbaum@stud.informatik.uni-erlangen.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Peter Baumann 2006-07-07 12:55:41 +02:00 committed by Junio C Hamano
parent d9bffc08fd
commit 135a522e3f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-cvsexportcommit.perl
View File

@ -63,15 +63,15 @@ foreach my $p (@commit) {
} }


if ($parent) { if ($parent) {
my $found;
# double check that it's a valid parent # double check that it's a valid parent
foreach my $p (@parents) { foreach my $p (@parents) {
my $found;
if ($p eq $parent) { if ($p eq $parent) {
$found = 1; $found = 1;
last; last;
}; # found it }; # found it
die "Did not find $parent in the parents for this commit!";
} }
die "Did not find $parent in the parents for this commit!" if !$found;
} else { # we don't have a parent from the cmdline... } else { # we don't have a parent from the cmdline...
if (@parents == 1) { # it's safe to get it from the commit if (@parents == 1) { # it's safe to get it from the commit
$parent = $parents[0]; $parent = $parents[0];