Merge branch 'gfi-maint' into gfi-master

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 184214689dfd3f1204546b060adbffd3f6d79bbe..557508015788f203c37c6a7402a147e53ab3943b 100755 (executable)
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -52,6 +52,7 @@
                        Z8 Z1 Z100 Z6
                        Z2 Z32 Z32 Z8 Z8 Z*', $_;
                last unless $name;
+               next if $name =~ '/$';
                $mode = oct $mode;
                $size = oct $size;
                $mtime = oct $mtime;