mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/import-tars-do-not-make-phony-files-from-pax-headers'

Browse Source 
The import-tars importer (in contrib/fast-import/) used to create
phony files at the top-level of the repository when the archive
contains global PAX headers, which made its own logic to detect and
omit the common leading directory ineffective, which has been
corrected.

* js/import-tars-do-not-make-phony-files-from-pax-headers:
  import-tars: ignore the global PAX header
This commit is contained in:
Junio C Hamano
2020-04-22 13:42:43 -07:00
parent d72fa768f4 c839fcff65
commit 8633f213e6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/fast-import/import-tars.perl
View File

@ -139,6 +139,8 @@ foreach my $tar_file (@ARGV)
print FI "\n"; print FI "\n";
} }
next if ($typeflag eq 'g'); # ignore global header
my $path; my $path;
if ($prefix) { if ($prefix) {
$path = "$prefix/$name"; $path = "$prefix/$name";