From ec2f6c0cca498bd1197893e9c653e64265c3a750 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Fri, 1 Jul 2022 05:19:59 +0000 Subject: [PATCH] t6429: fix use of non-existent function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- t/t6429-merge-sequence-rename-caching.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) ' -- 2.11.4.GIT