This was handled correctly also before, right?

I think the comment is not correct. We also catch tracked files here: newly created files which have been added to the index but which didn't exist in OURS,THEIRS or BASE.