Merge branch 'maint'

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 3b9860ea2ec4873d6e1135734817f76cde124032..80af6b9b7ea50652dff6804b589d134207e9258f 100755 (executable)
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -70,9 +70,7 @@ test_expect_success setup '
        E=`git rev-parse --verify HEAD:A/B/E` &&
        check_fsck &&
 
-       chmod +x C &&
-       ( test "`git config --bool core.filemode`" != false ||
-         echo executable >>C ) &&
+       test_chmod +x C &&
        git add C &&
        test_tick && git commit -m dragon &&
        L=`git rev-parse --verify HEAD` &&
@@ -175,7 +173,7 @@ test_expect_success 'recover and check' '
 
 '
 
-test_expect_failure 'delete' '
+test_expect_success 'delete' '
        echo 1 > C &&
        test_tick &&
        git commit -m rat C &&