Merge branch 'sg/t4051-fix'

gitster · gitster · commit 603160b17e18 · 2018-08-27T14:33:45.000-07:00
Test fixes.

* sg/t4051-fix:
  t4051-diff-function-context: read the right file
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
@@ -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'

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ test_expect_success ' context does not include other functions' '`
`174`	`174`	`'`
`175`	`175`
`176`	`176`	`test_expect_success ' context does not include preceding empty lines' '`
`177`		`- test "$(first_context_line <long_common_tail.diff.diff)" != " "`
	`177`	`+ test "$(first_context_line <long_common_tail.diff)" != " "`
`178`	`178`	`'`
`179`	`179`
`180`	`180`	`check_diff changed_hello_appended 'changed function plus appended function'`