diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-02 19:51:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-02 19:51:50 (GMT) |
| commit | c2f7b1026e33e308782fcb1b60e3d7af107fdc18 (patch) | |
| tree | 8768ef958c9dea375afcada68df1d0f1ae6d59c3 /t | |
| parent | 341e7e8eda3dbeb6867f4f8f45b671201b807de5 (diff) | |
| parent | 45067fc973c31953ab283f77f0f91eba9a272624 (diff) | |
| download | git-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.zip git-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.tar.gz git-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.tar.bz2 | |
Merge branch 'maint-1.8.5' into maint
* maint-1.8.5:
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 74de814..04118ad 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' ' |