diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 22:10:30 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 22:10:30 +0400 |
| commit | d22acacf810a92d5634099a7db0367ce5b6fdcef (patch) | |
| tree | 9536fe05bcb4067f19cd8020bc5bc04c468df7b7 /t | |
| parent | 34d5217584ee4722d0c0b07ed6c8f1f01ad157c3 (diff) | |
| parent | 8c2cfa55446f542454eb4acc7f49d1747e425c94 (diff) | |
Merge branch 'maint-1.8.5' into maint-1.9
* maint-1.8.5:
annotate: use argv_array
t7300: repair filesystem permissions with test_when_finished
enums: remove trailing ',' after last item in enum
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7300-clean.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 74de814aec..04118ad75b 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -426,10 +426,10 @@ test_expect_success SANITY 'removal failure' ' mkdir foo && touch foo/bar && + test_when_finished "chmod 755 foo" && (exec <foo/bar && chmod 0 foo && - test_must_fail git clean -f -d && - chmod 755 foo) + test_must_fail git clean -f -d) ' test_expect_success 'nested git work tree' ' |