From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Jun 2013 21:25:09 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.4-rc0~174
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4d1c565e1fb4e76c391448cdf85fe7c132bbb390?hp=879070e650d30ac8451b20b5851fad423552cfed

Merge branch 'maint'

* maint:
t0070 "mktemp to unwritable directory" needs SANITY
pre-push.sample: Make the script executable
---

diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh
index da2c504e53..986b2a8f26 100755
--- a/t/t0070-fundamental.sh
+++ b/t/t0070-fundamental.sh
@@ -17,7 +17,7 @@ test_expect_success 'mktemp to nonexistent directory prints filename' '
 	grep "doesnotexist/test" err
 '
 
-test_expect_success POSIXPERM 'mktemp to unwritable directory prints filename' '
+test_expect_success POSIXPERM,SANITY 'mktemp to unwritable directory prints filename' '
 	mkdir cannotwrite &&
 	chmod -w cannotwrite &&
 	test_when_finished "chmod +w cannotwrite" &&
diff --git a/templates/hooks--pre-push.sample b/templates/hooks--pre-push.sample
old mode 100644
new mode 100755