From: Junio C Hamano <junkio@cox.net>
Date: Thu, 10 May 2007 21:48:04 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc3~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ffcc952b33575e28b971d63ba2b7e46b7726a257?ds=inline;hp=-c

Merge branch 'maint'

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

ffcc952b33575e28b971d63ba2b7e46b7726a257
diff --combined contrib/fast-import/import-tars.perl
index a43b2c52f0,f0b9a43abd..1e6fa5a15c
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@@ -51,7 -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) {
@@@ -84,12 -84,7 +84,12 @@@
  		}
  		print FI "\n";
  
 -		my $path = "$prefix$name";
 +		my $path;
 +		if ($prefix) {
 +			$path = "$prefix/$name";
 +		} else {
 +			$path = "$name";
 +		}
  		$files{$path} = [$next_mark++, $mode];
  
  		$commit_time = $mtime if $mtime > $commit_time;