Merge branch 'jn/maint-gitweb-dynconf'

diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index 93d7189fbc3c1089fe729d8a144ea15d15e7de33..f90ed3da3e0cb93b63d32d8002dc6d9bd3596a65 100755 (executable)
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -82,7 +82,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' '
        git diff --quiet HEAD first
 '
 
-test_expect_failure 'cherry-pick -3 fourth works' '
+test_expect_success 'cherry-pick -3 fourth works' '
        git checkout -f master &&
        git reset --hard first &&
        test_tick &&