Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@palantir.com>2022-07-01 08:19:59 +0300
committerJunio C Hamano <gitster@pobox.com>2022-07-01 09:07:31 +0300
commitec2f6c0cca498bd1197893e9c653e64265c3a750 (patch)
tree986c9fc53c21cbb0678ffc93e778bf70cda6ca2b /t/t6429-merge-sequence-rename-caching.sh
parentdc8c8deaa6b5847733bd7df011a4c7b7d1a64e0a (diff)
t6429: fix use of non-existent function
This test had a line reading ! test_file_is_empty actual which was meant to be ! test_must_be_empty actual The test worked despite the error, because even though test_file_is_empty is a non-existent function, the '!' negated the return value and made it pass. It'd be better to avoid the negation, so something like test_file_not_empty actual would be better, but perhaps it makes even more sense to specify the number of lines of expected output to make the test a bit tighter. Reported-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Elijah Newren <newren@palantir.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6429-merge-sequence-rename-caching.sh')
-rwxr-xr-xt/t6429-merge-sequence-rename-caching.sh2
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
)
'