diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-25 07:02:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-25 07:02:38 +0200 |
| commit | 61397d4b8da2f2ab3fd767c6058ad05ca10269b8 (patch) | |
| tree | e3123467c1be150b7458a297c42ad6ab612e6657 /contrib | |
| parent | gitattributes documentation: clarify overriding (diff) | |
| parent | fast-import: size_t vs ssize_t (diff) | |
| download | git-61397d4b8da2f2ab3fd767c6058ad05ca10269b8.tar.xz git-61397d4b8da2f2ab3fd767c6058ad05ca10269b8.zip | |
Merge branch 'master' of git://repo.or.cz/git/fastimport
* 'master' of git://repo.or.cz/git/fastimport:
fast-import: size_t vs ssize_t
fix importing of subversion tars
Don't repack existing objects in fast-import
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/import-tars.perl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl index 5585a8b2c5..184214689d 100755 --- a/contrib/fast-import/import-tars.perl +++ b/contrib/fast-import/import-tars.perl @@ -64,7 +64,12 @@ foreach my $tar_file (@ARGV) } print FI "\n"; - my $path = "$prefix$name"; + my $path; + if ($prefix) { + $path = "$prefix/$name"; + } else { + $path = "$name"; + } $files{$path} = [$next_mark++, $mode]; $commit_time = $mtime if $mtime > $commit_time; |