[PATCH] import-tars: be nice to wrong directory modes

[PATCH] import-tars: be nice to wrong directory modes

[Johannes Schindelin]

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>
---
 contrib/fast-import/import-tars.perl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index 1842146..5575080 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;
-- 
1.5.2.rc0.2496.g74f7

Re: [PATCH] import-tars: be nice to wrong directory modes

[Shawn O. Pearce]

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> 
> Some tars seem to have modes 0755 for directories, not 01000755. Do
> not generate an empty object for them, but ignore them.

This fix is small and corrects a rather ugly repository corruption,
so I've applied it to my gfi-maint branch.

-- 
Shawn.

Re: [PATCH] import-tars: be nice to wrong directory modes

[Junio C Hamano]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
>> 
>> Some tars seem to have modes 0755 for directories, not 01000755. Do
>> not generate an empty object for them, but ignore them.
>
> This fix is small and corrects a rather ugly repository corruption,
> so I've applied it to my gfi-maint branch.

Good teamplay.  So you want me to pull gfi-maint to maint and
gfi-master to master?

Re: [PATCH] import-tars: be nice to wrong directory modes

[Shawn O. Pearce]

Junio C Hamano <junkio@cox.net> wrote:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
> 
> > Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> >> 
> >> Some tars seem to have modes 0755 for directories, not 01000755. Do
> >> not generate an empty object for them, but ignore them.
> >
> > This fix is small and corrects a rather ugly repository corruption,
> > so I've applied it to my gfi-maint branch.
> 
> Good teamplay.  So you want me to pull gfi-maint to maint and
> gfi-master to master?

Right.

And apply the fsck patch i sent to the list.  ;-)
 
-- 
Shawn.

Re: [PATCH] import-tars: be nice to wrong directory modes

[Randal L. Schwartz]

>>>>> "Johannes" == Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Johannes> +		next if $name =~ '/$';

This is misleading.  That's a regex there.  And it also falsely matches a
string ending in "/\n", but I bet there are parts of git that break on those
filenames too. :)

Consider:

        next if $name =~ m{/\z};

which matches precisely when the filename ends in /.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!