Commit 37f15d50 authored by Martin Langhoff's avatar Martin Langhoff Committed by Junio C Hamano

[PATCH] archimport: Actually cope with merges from "remote" repositories. Plus: Nicer messages.

archimport was refusing to import commits that had merges from repositories
that it didn't know about. Fixed.

Also brings in nicer messages.
Signed-off-by: 's avatarMartin Langhoff <martin@catalyst.net.nz>
Signed-off-by: 's avatarJunio C Hamano <junkio@cox.net>
parent 38ec15a9
......@@ -228,10 +228,12 @@ END
# skip commits already in repo
#
if (ptag($ps->{id})) {
$opt_v && print "Skipping already imported: $ps->{id}\n";
$opt_v && print " * Skipping already imported: $ps->{id}\n";
next;
}
print " * Starting to work on $ps->{id}\n";
#
# create the branch if needed
#
......@@ -675,6 +677,10 @@ sub find_parents {
# that branch.
#
foreach my $branch (keys %branches) {
# check that we actually know about the 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 $?;
chomp $mergebase;
......
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