Commit 9b626e75 authored by Eric Wong's avatar Eric Wong Committed by Martin Langhoff

archimport: don't die on merge-base failure

Don't die if we can't find a merge base, Arch allows arbitrary
cherry-picks between unrelated branches and we should not
die when that happens
Signed-off-by: 's avatarEric Wong <normalperson@yhbt.net>
Signed-off-by: 's avatarMartin Langhoff <martin@catalyst.net.nz>
parent a7fb51d3
......@@ -692,7 +692,13 @@ sub find_parents {
next unless -e "$git_dir/refs/heads/$branch";
my $mergebase = `git-merge-base $branch $ps->{branch}`;
die "Cannot find merge base for $branch and $ps->{branch}" if $?;
if ($?) {
# Don't die here, Arch supports one-way cherry-picking
# between branches with no common base (or any relationship
# at all beforehand)
warn "Cannot find merge base for $branch and $ps->{branch}";
next;
}
chomp $mergebase;
# now walk up to the mergepoint collecting what patches we have
......
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