summaryrefslogtreecommitdiff
path: root/archive-tar.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-20 19:04:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-20 19:04:46 (GMT)
commit15c6ef7b06e57746c7d8ec81c0a125df54434b60 (patch)
tree8a7f976e185d8f48d638d3360cee7c9168b3a382 /archive-tar.c
parent98349e5364da6164add4ede3e63ceba2cc39159b (diff)
downloadgit-15c6ef7b06e57746c7d8ec81c0a125df54434b60.zip
git-15c6ef7b06e57746c7d8ec81c0a125df54434b60.tar.gz
git-15c6ef7b06e57746c7d8ec81c0a125df54434b60.tar.bz2
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.
Diffstat (limited to 'archive-tar.c')
-rw-r--r--archive-tar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/archive-tar.c b/archive-tar.c
index df2f4c8..0d1e6bd 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));