diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-20 12:04:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-20 12:04:46 -0700 |
| commit | 15c6ef7b06e57746c7d8ec81c0a125df54434b60 (patch) | |
| tree | 8a7f976e185d8f48d638d3360cee7c9168b3a382 | |
| parent | Merge branch 'jc/completion-no-chdir' (diff) | |
| download | tgif-15c6ef7b06e57746c7d8ec81c0a125df54434b60.tar.xz | |
Revert "archive: honor tar.umask even for pax headers"
This reverts commit 10f343ea814f5c18a0913997904ee11cd9b7da24, 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.
| -rw-r--r-- | archive-tar.c | 4 | ||||
| -rwxr-xr-x | t/t5004-archive-corner-cases.sh | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/archive-tar.c b/archive-tar.c index df2f4c8a64..0d1e6bd754 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -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)); diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh index 83d20c4ba9..305bcac6b7 100755 --- a/t/t5004-archive-corner-cases.sh +++ b/t/t5004-archive-corner-cases.sh @@ -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 |