summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-29 08:52:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-29 08:52:43 (GMT)
commit39231b1c32caee10c7ac3397341ea0c6cf56e7f9 (patch)
tree5e51fb9d639bf6b6b99ae5d01286360b7303f2f1 /contrib/fast-import
parent4342572600f446b9f8db553df03d458229f944dd (diff)
parente9d54bd18bcf5dc9eb68eb1cba9a6a7ba3f71fd6 (diff)
downloadgit-39231b1c32caee10c7ac3397341ea0c6cf56e7f9.zip
git-39231b1c32caee10c7ac3397341ea0c6cf56e7f9.tar.gz
git-39231b1c32caee10c7ac3397341ea0c6cf56e7f9.tar.bz2
Merge branch 'maint'
* maint: http.c: Fix problem with repeated calls of http_init Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation Fix import-tars fix. Update .mailmap with "Michael" Do not barf on too long action description Catch empty pathnames in trees during fsck Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes git-svn: Added 'find-rev' command git shortlog documentation: add long options and fix a typo
Diffstat (limited to 'contrib/fast-import')
-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 1842146..d2363a4 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 =~ m{/\z};
$mode = oct $mode;
$size = oct $size;
$mtime = oct $mtime;