From: Michael Loeffler <zvpunry@zvpunry.de>
Date: Mon, 12 Feb 2007 14:17:11 +0000 (+0100)
Subject: import-tars: brown paper bag fix for file mode.
X-Git-Tag: v1.5.0~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d63ea115948a892f94451677c322c5a6f233adc6;p=git.git

import-tars: brown paper bag fix for file mode.

There is a bug with this $git_mode variable which should be 0644
or 0755, but nothing else I think.

Signed-off-by: Michael Loeffler <zvpunry@zvpunry.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 26c42c978..990c9e70b 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -83,10 +83,8 @@ EOF
 	foreach my $path (keys %files)
 	{
 		my ($mark, $mode) = @{$files{$path}};
-		my $git_mode = 0644;
-		$git_mode |= 0700 if $mode & 0111;
 		$path =~ s,^([^/]+)/,, if $have_top_dir;
-		printf FI "M %o :%i %s\n", $git_mode, $mark, $path;
+		printf FI "M %o :%i %s\n", $mode & 0111 ? 0755 : 0644, $mark, $path;
 	}
 	print FI "\n";