Revert "archive: honor tar.umask even for pax headers"

This reverts commit 10f343ea81, whose
output is no longer bit-for-bit equivalent from the older versions
of Git, which the infrastructure to (pretend to) upload tarballs
kernel.org uses depends on.
pull/110/head
Junio C Hamano 8 years ago
parent 98349e5364
commit 15c6ef7b06
  1. 4
      archive-tar.c
  2. 5
      t/t5004-archive-corner-cases.sh

@ -192,7 +192,7 @@ static int write_extended_header(struct archiver_args *args,
unsigned int mode;
memset(&header, 0, sizeof(header));
*header.typeflag = TYPEFLAG_EXT_HEADER;
mode = 0100666 & ~tar_umask;
mode = 0100666;
sprintf(header.name, "%s.paxheader", sha1_to_hex(sha1));
prepare_header(args, &header, mode, size);
write_blocked(&header, sizeof(header));
@ -300,7 +300,7 @@ static int write_global_extended_header(struct archiver_args *args)
strbuf_append_ext_header(&ext_header, "comment", sha1_to_hex(sha1), 40);
memset(&header, 0, sizeof(header));
*header.typeflag = TYPEFLAG_GLOBAL_HEADER;
mode = 0100666 & ~tar_umask;
mode = 0100666;
strcpy(header.name, "pax_global_header");
prepare_header(args, &header, mode, ext_header.len);
write_blocked(&header, sizeof(header));

@ -113,9 +113,4 @@ test_expect_success 'archive empty subtree by direct pathspec' '
check_dir extract sub
'
test_expect_success 'archive applies umask even for pax headers' '
git archive --format=tar HEAD >archive.tar &&
! grep 0666 archive.tar
'
test_done

Loading…
Cancel
Save