diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-27 13:19:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-27 13:19:50 -0700 |
| commit | 7c96fbc5aa96a66667d5ce9687080c8e6c0dd665 (patch) | |
| tree | bab68994661842f5d52fcdb9656c957b6cc9fa3d | |
| parent | Merge branch 'ds/vscode-settings' into maint (diff) | |
| parent | t6429: fix use of non-existent function (diff) | |
| download | git-7c96fbc5aa96a66667d5ce9687080c8e6c0dd665.tar.gz git-7c96fbc5aa96a66667d5ce9687080c8e6c0dd665.zip | |
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
| -rwxr-xr-x | t/t6429-merge-sequence-rename-caching.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh index f2bc8a7d2a..e1ce919916 100755 --- 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 ) ' |