Miklos Vajna wrote: > > Oh, the racy git problem. ;-) > > $ git reset --hard; touch foo; git merge side IIUC, this is not the same as "racy git". The racy case is if you manage to get a file changed immediately after its index entry was updated, so that it will look unchanged. In this case, it's simply the same file with a new mtime, which means it looks changed superficially but still has the same contents. Granted, you could call my test "racy" because it relies on 'make install' taking at least one second, which by Moore's law should happen sometime around 2019 ;-) > Thanks for the reproducer, I'll write a proper testcase for this and try to > provide a fix for it as well. Thanks. - Thomas -- Thomas Rast trast@xxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: This is a digitally signed message part.
