Hi, On Mon, 28 Jul 2008, Johannes Schindelin wrote: > On Mon, 28 Jul 2008, SZEDER Gábor wrote: > > > there is a race somewhere in these 'git-mv: Keep moved index entries > > inact' changes. > > > > The test cases 'git mv should overwrite symlink to a file' or 'git mv > > should overwrite file with a symlink' fail occasionaly. It's quite > > non-deterministic: I have run t7001-mv.sh in a loop (see below) and > > one or the other usually fails around 50 runs (but sometimes only > > after 150). Adding some tracing echos to the tests shows that both > > tests fail when running 'git diff-files' at the end. > > To make it more convenient to test: with this patch it fails all the time: Ooops. Seems like I changed the test 23 to fail, instead of test 24. However, I think it is the same bug: the index is newer by one second, so it seems that the patch for builtin-mv.c did not really keep the data "intact". Note that a test case should use test-chmtime to force this scenario, not sleep a second. Unfortunately, I already spent my Git time budget for today, so the ball is out of my half for now. Ciao, Dscho