From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Sep 2014 20:27:12 +0000 (-0700)
Subject: Merge branch 'bc/archive-pax-header-mode'
X-Git-Tag: v2.2.0-rc0~175
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4740891e47de5ee33d91ffa3fdde25e8f0c4af74?hp=-c

Merge branch 'bc/archive-pax-header-mode'

Implementations of "tar" that do not understand an extended pax
header would extract the contents of it in a regular file; make
sure the permission bits of this file follows the same tar.umask
configuration setting.

* bc/archive-pax-header-mode:
archive: honor tar.umask even for pax headers
---

4740891e47de5ee33d91ffa3fdde25e8f0c4af74
diff --combined t/t5004-archive-corner-cases.sh
index 305bcac6b7,4461c961a9..83d20c4ba9
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@@ -45,7 -45,7 +45,7 @@@ test_expect_success HEADER_ONLY_TAR_OK 
  test_expect_success 'tar archive of empty tree is empty' '
  	git archive --format=tar HEAD: >empty.tar &&
  	perl -e "print \"\\0\" x 10240" >10knuls.tar &&
 -	test_cmp 10knuls.tar empty.tar
 +	test_cmp_bin 10knuls.tar empty.tar
  '
  
  test_expect_success 'tar archive of empty tree with prefix' '
@@@ -113,4 -113,9 +113,9 @@@ test_expect_success 'archive empty subt
  	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