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
rehsack · Jun 11, 2013 · f2b4626 · f2b4626
2 parents 362de91 + b3b8ceb
commit f2b4626
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git 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