aboutsummaryrefslogtreecommitdiff
path: root/contrib/fast-import/import-tars.perl
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-04-28 20:05:58 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-04-28 20:05:58 -0400
commitaff787b52bc8e1d7fcfce5d28d1fc569f905d3c1 (patch)
tree92e0d3418108195cb07d7c51d3f70b6b78431a41 /contrib/fast-import/import-tars.perl
parent4342572600f446b9f8db553df03d458229f944dd (diff)
parentec771a7084ed9352ac6b14ed6ff437e67aba0f0b (diff)
downloadgit-aff787b52bc8e1d7fcfce5d28d1fc569f905d3c1.tar.gz
git-aff787b52bc8e1d7fcfce5d28d1fc569f905d3c1.tar.xz
Merge branch 'gfi-maint' into gfi-master
* gfi-maint: Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes
Diffstat (limited to 'contrib/fast-import/import-tars.perl')
-rwxr-xr-xcontrib/fast-import/import-tars.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 184214689..557508015 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -52,6 +52,7 @@ foreach my $tar_file (@ARGV)
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;