From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Aug 2018 21:33:45 +0000 (-0700)
Subject: Merge branch 'sg/t4051-fix'
X-Git-Tag: v2.19.0-rc1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=603160b17e1884da3584dc5b424ecea4865c3d52;p=thirdparty%2Fgit.git

Merge branch 'sg/t4051-fix'

Test fixes.

* sg/t4051-fix:
  t4051-diff-function-context: read the right file
---

603160b17e1884da3584dc5b424ecea4865c3d52
diff --cc t/t4051-diff-function-context.sh
index 2d76a971c4,3df24f2ef2..4838a1df8b
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@@ -174,39 -154,7 +174,39 @@@ test_expect_success ' context does not 
  '
  
  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'
 +
 +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
 +'
 +
 +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