Merge branch 'maint-1.8.2' into maint

* maint-1.8.2:
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 da2c504e53e37840f71790d6b262106b7b57d697..986b2a8f2664b1734964049a5b24fc50cf938cfe 100755 (executable)
--- 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 (file)
new mode 100755 (executable)