Merge branch 'ew/daemon-socket-keepalive' into maint

diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index f7126fc2458247c52cdcd81a4c09cee9d7402696..b79b87790b29f6f1193578fd725d22da7058c819 100755 (executable)
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -64,7 +64,13 @@ test_expect_success 'setup' '
 
        grep -v "Begin of second part" <file.c >file.c.new &&
        mv file.c.new file.c &&
-       commit_and_tag long_common_tail file.c
+       commit_and_tag long_common_tail file.c &&
+
+       git checkout initial &&
+       grep -v "delete me from hello" <file.c >file.c.new &&
+       mv file.c.new file.c &&
+       cat "$dir/appended1.c" >>file.c &&
+       commit_and_tag changed_hello_appended file.c
 '
 
 check_diff changed_hello 'changed function'
@@ -85,7 +91,7 @@ test_expect_success ' context does not include preceding empty lines' '
        test "$(first_context_line <changed_hello.diff)" != " "
 '
 
-test_expect_failure ' context does not include trailing empty lines' '
+test_expect_success ' context does not include trailing empty lines' '
        test "$(last_context_line <changed_hello.diff)" != " "
 '
 
@@ -103,7 +109,7 @@ test_expect_success ' context does not include other functions' '
        test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
 '
 
-test_expect_failure ' context does not include trailing empty lines' '
+test_expect_success ' context does not include trailing empty lines' '
        test "$(last_context_line <changed_includes.diff)" != " "
 '
 
@@ -145,7 +151,7 @@ test_expect_success ' context includes begin' '
        grep "^ .*Begin of first part" long_common_tail.diff
 '
 
-test_expect_failure ' context includes end' '
+test_expect_success ' context includes end' '
        grep "^ .*End of second part" long_common_tail.diff
 '
 
@@ -157,4 +163,20 @@ test_expect_success ' context does not include preceding empty lines' '
        test "$(first_context_line <long_common_tail.diff.diff)" != " "
 '
 
+check_diff changed_hello_appended 'changed function plus appended function'
+
+test_expect_success ' context includes begin' '
+       grep "^ .*Begin of hello" changed_hello_appended.diff &&
+       grep "^[+].*Begin of first part" changed_hello_appended.diff
+'
+
+test_expect_success ' context includes end' '
+       grep "^ .*End of hello" changed_hello_appended.diff &&
+       grep "^[+].*End of first part" changed_hello_appended.diff
+'
+
+test_expect_success ' context does not include other functions' '
+       test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
+'
+
 test_done