Commit 135a522e authored by Peter Baumann's avatar Peter Baumann Committed by Junio C Hamano

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: default avatarPeter Baumann <siprbaum@stud.informatik.uni-erlangen.de>
Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
parent d9bffc08
......@@ -63,15 +63,15 @@
}
if ($parent) {
my $found;
# double check that it's a valid parent
foreach my $p (@parents) {
my $found;
if ($p eq $parent) {
$found = 1;
last;
}; # 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...
if (@parents == 1) { # it's safe to get it from the commit
$parent = $parents[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment