aboutsummaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-10 14:48:04 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-10 14:48:04 -0700
commitffcc952b33575e28b971d63ba2b7e46b7726a257 (patch)
tree4429a3b7a1479945407f0f35d173d6e70026ed21 /contrib/fast-import
parent63fcbe00a66d7cb7d8bce9a36120a19a809a33b8 (diff)
parenta9d9a1bfdddd5f177617abc943fba10f6cc68066 (diff)
downloadgit-ffcc952b33575e28b971d63ba2b7e46b7726a257.tar.gz
git-ffcc952b33575e28b971d63ba2b7e46b7726a257.tar.xz
Merge branch 'maint'
* maint: Fix documentation of tag in git-fast-import.txt Properly handle '0' filenames in import-tars
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/import-tars.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index a43b2c52f..1e6fa5a15 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -51,7 +51,7 @@ foreach my $tar_file (@ARGV)
$prefix) = unpack 'Z100 Z8 Z8 Z8 Z12 Z12
Z8 Z1 Z100 Z6
Z2 Z32 Z32 Z8 Z8 Z*', $_;
- last unless $name;
+ last unless length($name);
if ($name eq '././@LongLink') {
# GNU tar extension
if (read(I, $_, 512) != 512) {