From 10945e006a9567f4da1dac15cfdc1035752c5c5e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 23 Nov 2005 23:58:16 -0800 Subject: [PATCH] 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 Signed-off-by: Martin Langhoff --- git-archimport.perl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/git-archimport.perl b/git-archimport.perl index 008085001..aab4e3844 100755 --- a/git-archimport.perl +++ b/git-archimport.perl @@ -499,7 +499,7 @@ foreach my $ps (@psets) { # if (ptag($ps->{id})) { $opt_v && print " * Skipping already imported: $ps->{id}\n"; - return 0; + next; } print " * Starting to work on $ps->{id}\n"; @@ -578,10 +578,6 @@ foreach my $ps (@psets) { 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) { -- 2.26.2