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
2013-06-11 14:24:56 -07:00 · 2013-06-11 14:24:56 -07:00 · f2b4626d9e
parent 362de916c0 b3b8ceb48b
commit f2b4626d9e
2 changed files with 1 additions and 1 deletions
--- 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" &&
--- a/templates/hooks--pre-push.sample
+++ b/templates/hooks--pre-push.sample