From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Oct 2014 17:08:15 +0000 (-0700)
Subject: Merge branch 'mg/lib-gpg-ro-safety'
X-Git-Tag: v2.2.0-rc0~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7654ca696348feaab3c7000b9bd13985e03f43ae?hp=-c

Merge branch 'mg/lib-gpg-ro-safety'

In a tarball extract whose files are all read-only, running GPG
tests would have failed due to unwritable files.

* mg/lib-gpg-ro-safety:
t/lib-gpg: make gpghome files writable
---

7654ca696348feaab3c7000b9bd13985e03f43ae
diff --combined t/lib-gpg.sh
index fd499e7c49,fc5ca99046..cd2baef383
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@@ -1,6 -1,6 +1,6 @@@
  #!/bin/sh
  
 -gpg_version=`gpg --version 2>&1`
 +gpg_version=$(gpg --version 2>&1)
  if test $? = 127; then
  	say "You do not seem to have gpg installed"
  else
@@@ -18,6 -18,7 +18,7 @@@
  		# No password given, to enable non-interactive operation.
  		cp -R "$TEST_DIRECTORY"/lib-gpg ./gpghome
  		chmod 0700 gpghome
+ 		chmod 0600 gpghome/*
  		GNUPGHOME="$(pwd)/gpghome"
  		export GNUPGHOME
  		test_set_prereq GPG