t6042: Add a pair of cases where undetected renames cause issues