Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split

diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index 30fc5bf2b36d815d6a43f2b439f938b81a8816ca..4838a1df8b4369dc5024cdd7929d851b76482805 100755 (executable)
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -85,7 +85,7 @@ test_expect_success 'setup' '
 
 check_diff changed_hello 'changed function'
 
-test_expect_failure ' context includes comment' '
+test_expect_success ' context includes comment' '
        grep "^ .*Hello comment" changed_hello.diff
 '
 
@@ -174,7 +174,7 @@ test_expect_success ' context does not include other functions' '
 '
 
 test_expect_success ' context does not include preceding empty lines' '
-       test "$(first_context_line <long_common_tail.diff.diff)" != " "
+       test "$(first_context_line <long_common_tail.diff)" != " "
 '
 
 check_diff changed_hello_appended 'changed function plus appended function'