diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 14:24:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 14:24:56 -0700 |
| commit | f2b4626d9e78e00d2168a8470633d6c7f5331a13 (patch) | |
| tree | 7370ee5177437baf37b4a2e169773310238d5d7c | |
| parent | 362de916c06521205276acb7f51c99f47db94727 (diff) | |
| parent | b3b8ceb48b7d75631a8638f1dc6ccdf7f1b53888 (diff) | |
| download | git-f2b4626d9e78e00d2168a8470633d6c7f5331a13.tar.gz | |
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
| -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 |