summaryrefslogtreecommitdiff
path: root/git-archimport.perl
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2005-11-24 07:58:16 (GMT)
committerMartin Langhoff <martin@catalyst.net.nz>2005-12-11 01:41:40 (GMT)
commit10945e006a9567f4da1dac15cfdc1035752c5c5e (patch)
tree5f6475a11e9dd61b1c789be9680a0a4bf3888ea5 /git-archimport.perl
parent6e33101abd82f38393b8f2a137601add845722f7 (diff)
downloadgit-10945e006a9567f4da1dac15cfdc1035752c5c5e.zip
git-10945e006a9567f4da1dac15cfdc1035752c5c5e.tar.gz
git-10945e006a9567f4da1dac15cfdc1035752c5c5e.tar.bz2
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-xgit-archimport.perl6
1 files changed, 1 insertions, 5 deletions
diff --git a/git-archimport.perl b/git-archimport.perl
index 0080850..aab4e38 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) {