summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Pedro Alvarez Piedehierro <palvarez89@gmail.com>2018-05-23 23:54:17 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-24 08:35:51 +0900
commit12ecea46e3a7542918efaf595fd866e74d3dba3d (patch)
treedeb11a565a4421c2b796340f0c3782a047cc316e /git-merge-resolve.sh
parentGit 2.17 (diff)
downloadtgif-12ecea46e3a7542918efaf595fd866e74d3dba3d.tar.xz
import-tars: read overlong names from pax extended header
Importing gcc tarballs[1] with import-tars script (in contrib) fails when hitting a pax extended header. Make sure we always read the extended attributes from the pax entries, and store the 'path' value if found to be used in the next ustar entry. The code to parse pax extended headers was written consulting the Pax Pax Interchange Format documentation [2]. [1] http://ftp.gnu.org/gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz [2] https://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+8-current&query=tar&sektion=5 Signed-off-by: Pedro Alvarez <palvarez89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions