X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-archimport.perl;h=980e827b27ae0fa9a07667501d4cb26b5673cedf;hb=303958dc42d451aead0e1b9cf7b9836831a05f4b;hp=3749b8b5728f7bdb0f6adb317b25ecfa81902042;hpb=127bf00f7d2fee044602bec8c76ec9d6bf368025;p=git.git

diff --git a/git-archimport.perl b/git-archimport.perl
index 3749b8b5..980e827b 100755
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -228,10 +228,12 @@ foreach my $ps (@psets) {
     # 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;