From: Junio C Hamano <junkio@cox.net>
Date: Thu, 10 May 2007 21:47:14 +0000 (-0700)
Subject: Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint
X-Git-Tag: v1.5.2-rc3~4^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a9d9a1bfdddd5f177617abc943fba10f6cc68066?hp=b722b9585518c9d75ec5d8731cb90dc0c9fb918c

Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

* 'maint' of git://repo.or.cz/git/fastimport:
Fix documentation of tag in git-fast-import.txt
Properly handle '0' filenames in import-tars
---

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index e46492048c..f0b9a43abd 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -51,7 +51,7 @@
 			$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) {