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: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>

diff --git a/git-archimport.perl b/git-archimport.perl
index b7c1fbf0ca19a0b5cc052d076022a7feafbe2d97..d8e6f4e4486223651568532fa628840d5a70254d 100755 (executable)
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -692,7 +692,13 @@ sub find_parents {
        next unless -e "$git_dir/refs/heads/$branch";
 
        my $mergebase = `git-merge-base $branch $ps->{branch}`;
        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
        chomp $mergebase;
 
        # now walk up to the mergepoint collecting what patches we have