Merge branch 'en/t6429-test-must-be-empty-fix' into maint
A test fix. source: <pull.1276.git.1656652799863.gitgitgadget@gmail.com> * en/t6429-test-must-be-empty-fix: t6429: fix use of non-existent function
This commit is contained in:
@@ -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
|
||||
)
|
||||
'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user