Merge branch 'gfi-maint' into gfi-master

* gfi-maint:
  Don't allow empty pathnames in fast-import
  import-tars: be nice to wrong directory modes

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;

fast-import.c

@@ -1199,6 +1199,8 @@ static int tree_content_set(
 		n = slash1 - p;
 	else
 		n = strlen(p);
+	if (!n)
+		die("Empty path component found in input");
 
 	for (i = 0; i < t->entry_count; i++) {
 		e = t->entries[i];