Merge branch 'sd/t3200-branch-m-test'

diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index b79b87790b29f6f1193578fd725d22da7058c819..3e6b485ecba1a59e3d69edc3ac5a6f0f1d327bd3 100755 (executable)
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -66,6 +66,16 @@ test_expect_success 'setup' '
        mv file.c.new file.c &&
        commit_and_tag long_common_tail file.c &&
 
+       git checkout initial &&
+       cat "$dir/hello.c" "$dir/dummy.c" >file.c &&
+       commit_and_tag hello_dummy file.c &&
+
+       # overlap function context of 1st change and -u context of 2nd change
+       grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
+       sed "2a\\
+            extra line" <"$dir/dummy.c" >>file.c &&
+       commit_and_tag changed_hello_dummy file.c &&
+
        git checkout initial &&
        grep -v "delete me from hello" <file.c >file.c.new &&
        mv file.c.new file.c &&
@@ -179,4 +189,20 @@ test_expect_success ' context does not include other functions' '
        test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
 '
 
+check_diff changed_hello_dummy 'changed two consecutive functions'
+
+test_expect_success ' context includes begin' '
+       grep "^ .*Begin of hello" changed_hello_dummy.diff &&
+       grep "^ .*Begin of dummy" changed_hello_dummy.diff
+'
+
+test_expect_success ' context includes end' '
+       grep "^ .*End of hello" changed_hello_dummy.diff &&
+       grep "^ .*End of dummy" changed_hello_dummy.diff
+'
+
+test_expect_success ' overlapping hunks are merged' '
+       test $(grep -c "^@@" changed_hello_dummy.diff) -eq 1
+'
+
 test_done