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

From

MLMartin Langhoff <martin@catalyst.net.nz>

Date

Sep 30, 2005, 07:15 UTC

Message-ID

<11280645122296-git-send-email-martin@catalyst.net.nz>

Also brings in nicer messages.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>

---

 git-archimport.perl |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

d118e96e7f08fcd0963eac8d9e6f18e13f553a41

diff --git a/git-archimport.perl b/git-archimport.perl
--- 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;