Merge branch 'jz/gitweb-conf-doc-fix'

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 74de814aec1465848ba316e867106a18635139f6..99be5d95d063f85873a4cb5c5c7ebefd8ebfc990 100755 (executable)
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -119,10 +119,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' '
                git clean -n ../src |
                sed -n -e "s|^Would remove ||p"
        ) &&
-       test "$would_clean" = ../src/part3.c || {
-               echo "OOps <$would_clean>"
-               false
-       }
+       verbose test "$would_clean" = ../src/part3.c
 '
 
 test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' '
@@ -134,10 +131,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' '
                git clean -n "$(pwd)/../src" |
                sed -n -e "s|^Would remove ||p"
        ) &&
-       test "$would_clean" = ../src/part3.c || {
-               echo "OOps <$would_clean>"
-               false
-       }
+       verbose test "$would_clean" = ../src/part3.c
 '
 
 test_expect_success 'git clean with out of work tree relative path' '
@@ -426,10 +420,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' '