diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 14:25:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 14:25:09 -0700 |
| commit | 4d1c565e1fb4e76c391448cdf85fe7c132bbb390 (patch) | |
| tree | a866a08e40a7f2b58f7a0ced90ba224f6b0a71de | |
| parent | 879070e650d30ac8451b20b5851fad423552cfed (diff) | |
| parent | f2b4626d9e78e00d2168a8470633d6c7f5331a13 (diff) | |
| download | git-4d1c565e1fb4e76c391448cdf85fe7c132bbb390.tar.gz | |
Merge branch 'maint'
* maint:
t0070 "mktemp to unwritable directory" needs SANITY
pre-push.sample: Make the script executable
| -rwxr-xr-x | t/t0070-fundamental.sh | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | templates/hooks--pre-push.sample | 0 |
2 files changed, 1 insertions, 1 deletions
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 index 15ab6d8e7e..15ab6d8e7e 100644..100755 --- a/templates/hooks--pre-push.sample +++ b/templates/hooks--pre-push.sample |