diff options
| author | Eric Wong <normalperson@yhbt.net> | 2005-11-23 23:58:16 -0800 |
|---|---|---|
| committer | Martin Langhoff <martin@catalyst.net.nz> | 2005-12-11 14:41:40 +1300 |
| commit | 10945e006a9567f4da1dac15cfdc1035752c5c5e (patch) | |
| tree | 5f6475a11e9dd61b1c789be9680a0a4bf3888ea5 /git-archimport.perl | |
| parent | 6e33101abd82f38393b8f2a137601add845722f7 (diff) | |
| download | git-10945e006a9567f4da1dac15cfdc1035752c5c5e.tar.gz git-10945e006a9567f4da1dac15cfdc1035752c5c5e.tar.xz | |
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>
Diffstat (limited to 'git-archimport.perl')
| -rwxr-xr-x | git-archimport.perl | 6 |
1 files changed, 1 insertions, 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) { |