Add git-pack-intersect to .gitignore

diff --git a/git-archimport.perl b/git-archimport.perl
index 3749b8b5728f7bdb0f6adb317b25ecfa81902042..e22c81628dbde8a16c0bef5f64d3e6b34fba4f26 100755 (executable)
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -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
     #
@@ -563,6 +565,11 @@ sub parselog {
             next if $t =~ m!\{arch\}/!;
             next if $t =~ m!\.arch-ids/!;
             next if $t =~ m!\.arch-inventory$!;
+           # tla cat-archive-log will give us filenames with spaces as file\(sp)name - why?
+           # we can assume that any filename with \ indicates some pika escaping that we want to get rid of.
+           if  ($t =~ /\\/ ){
+               $t = `tla escape --unescaped '$t'`;
+           }
             push (@tmp, shell_quote($t));
         }
         @$ref = @tmp;
@@ -675,6 +682,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;