On Sat, Aug 8, 2020 at 1:02 PM Elijah Newren via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote: > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> > --- > diff --git a/t/t6422-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh > @@ -974,8 +974,8 @@ test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' ' > - test_cmp file_is_missing foo && > - test_cmp file_is_missing bar && > + test_path_is_missing foo && > + test_path_is_missing bar && These errors in the tests went unnoticed because they are inside test_expect_failure(), which makes one wonder if test_cmp() should be updated to throw a hard error to help diagnose this sort of problem sooner. (Then again, that might be overkill since there are relatively few test_expect_failures() around, so it may not buy us much. On the other hand, every little bit helps.)