diff --git a/git-archimport.perl b/git-archimport.perl
index 3749b8b5728f7bdb0f6adb317b25ecfa81902042..980e827b27ae0fa9a07667501d4cb26b5673cedf 100755 (executable)
--- a/git-archimport.perl
+++ b/git-archimport.perl
# 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
#
# 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;