archimport: fix a in new changeset applyer addition

Fix a stupid bug I introduced when splitting the
accurate and fast changeset appliers.

Also, remove an old debugging statement I added

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>

diff --git a/git-archimport.perl b/git-archimport.perl
index 00808500165068247826895c063aebce8e9901f7..aab4e38440ef0d9d757f3df09406901a9693a356 100755 (executable)
--- a/git-archimport.perl
+++ b/git-archimport.perl
@@ -499,7 +499,7 @@ sub process_patchset_fast {
     #
     if (ptag($ps->{id})) {
       $opt_v && print " * Skipping already imported: $ps->{id}\n";
     #
     if (ptag($ps->{id})) {
       $opt_v && print " * Skipping already imported: $ps->{id}\n";

-      return 0;
+      next;

     }
 
     print " * Starting to work on $ps->{id}\n";
     }
 
     print " * Starting to work on $ps->{id}\n";


@@ -578,10 +578,6 @@ sub process_patchset_fast {
     print "   + commit $commitid\n";
     $opt_v && print "   + commit date is  $ps->{date} \n";
     $opt_v && print "   + parents:  ",join(' ',@par),"\n";
     print "   + commit $commitid\n";
     $opt_v && print "   + commit date is  $ps->{date} \n";
     $opt_v && print "   + parents:  ",join(' ',@par),"\n";

-    if (my $dirty = `git-diff-files`) {
-        die "22 Unclean tree when about to process $ps->{id} " .
-            " - did we fail to commit cleanly before?\n$dirty";
-    }

 }
 
 if ($opt_v) {
 }
 
 if ($opt_v) {