summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Loeffler <zvpunry@zvpunry.de>2007-02-12 14:17:11 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-02-12 17:19:45 (GMT)
commitd63ea115948a892f94451677c322c5a6f233adc6 (patch)
tree2d5ee2b75089417228117a81fe11bf0b36a750e8
parentea5e370aa9203f999dd8bcd4a9cd29452f1c9181 (diff)
downloadgit-d63ea115948a892f94451677c322c5a6f233adc6.zip
git-d63ea115948a892f94451677c322c5a6f233adc6.tar.gz
git-d63ea115948a892f94451677c322c5a6f233adc6.tar.bz2
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>
-rwxr-xr-xcontrib/fast-import/import-tars.perl4
1 files changed, 1 insertions, 3 deletions
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 26c42c9..990c9e7 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";