Merge branch 'en/t6429-test-must-be-empty-fix' into maint

gitster · gitster · commit 7c96fbc5aa96 · 2022-07-27T13:19:50.000-07:00
A test fix.
source: &lt;pull.1276.git.1656652799863.gitgitgadget@gmail.com&gt;

* en/t6429-test-must-be-empty-fix:
  t6429: fix use of non-existent function
diff --git a/t/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh
@@ -760,7 +760,7 @@ test_expect_success 'avoid assuming we detected renames' '
 		test_must_fail git -c merge.renameLimit=1 rebase upstream &&
 
 		git ls-files -u >actual &&
-		! test_file_is_empty actual
+		test_line_count = 2 actual
 	)
 '
 

Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,7 @@ test_expect_success 'avoid assuming we detected renames' '`
`760`	`760`	`test_must_fail git -c merge.renameLimit=1 rebase upstream &&`
`761`	`761`
`762`	`762`	`git ls-files -u >actual &&`
`763`		`- ! test_file_is_empty actual`
	`763`	`+ test_line_count = 2 actual`
`764`	`764`	`)`
`765`	`765`	`'`
`766`	`766`