X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FImport.pm;h=250a2db31e979054c94df5a0e1dd6ca2d8a5f883;hb=e350de7fdbe12dafc36e893e66ce8c93ec6dc3f2;hp=c7a96e1eabcc1214e6cdc61572ba6ed70db64750;hpb=69329215485cf2ab9d8cd1fa7faf65d8ec42dc0b;p=public-inbox.git

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index c7a96e1e..250a2db3 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -117,6 +117,9 @@ sub _cat_blob ($$$) {
 	$n = read($r, my $lf, 1);
 	defined($n) or die "read final byte of cat-blob failed: $!";
 	die "bad read on final byte: <$lf>" if $lf ne "\n";
+
+	# fixup some bugginess in old versions:
+	$buf =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
 	\$buf;
 }
 
@@ -437,6 +440,8 @@ sub done {
 	_update_git_info($self, 1) if delete $self->{nchg};
 
 	$self->lock_release;
+
+	$self->{git}->cleanup;
 }
 
 sub atfork_child {