From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Sat, 28 Apr 2007 23:59:47 +0000 (+0200)
Subject: import-tars: be nice to wrong directory modes
X-Git-Tag: v1.5.1.3~11^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=87859f34434dda61cabb03447efd1dd2fe7ebac7;p=git.git

import-tars: be nice to wrong directory modes

Some tars seem to have modes 0755 for directories, not 01000755. Do
not generate an empty object for them, but ignore them.

Noticed by riddochc on IRC.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 5585a8b2c..e84647770 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;