diff options
| author | Eric Wong <normalperson@yhbt.net> | 2005-11-12 01:27:21 -0800 |
|---|---|---|
| committer | Martin Langhoff <martin@catalyst.net.nz> | 2005-11-17 20:29:35 +1300 |
| commit | 9b626e752eebcc49acab19085947e67b5e61e39f (patch) | |
| tree | fabf0cea28e9e3a5916e048653d5b9fe1ef3cbb1 /git-archimport.perl | |
| parent | a7fb51d3d4d303d61831b2fe5127a088b050e60b (diff) | |
| download | git-9b626e752eebcc49acab19085947e67b5e61e39f.tar.gz | |
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>
Diffstat (limited to 'git-archimport.perl')
| -rwxr-xr-x | git-archimport.perl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-archimport.perl b/git-archimport.perl index b7c1fbf0ca..d8e6f4e448 100755 --- 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}`; - 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 |