Merge branch 'master' of git://repo.or.cz/git/fastimport

diff --git a/t/t0010-racy-git.sh b/t/t0010-racy-git.sh
index eb175b780f4f60574425a720fb3536ad4618a94c..e45a9e40e432524454e94a041599b201a092879a 100755 (executable)
--- a/t/t0010-racy-git.sh
+++ b/t/t0010-racy-git.sh
@@ -7,18 +7,27 @@ test_description='racy GIT'
 # This test can give false success if your machine is sufficiently
 # slow or your trial happened to happen on second boundary.
 
-for trial in 0 1 2 3 4 5 6 7 8 9
+for trial in 0 1 2 3 4
 do
        rm -f .git/index
        echo frotz >infocom
-       echo xyzzy >activision
-       git update-index --add infocom activision
+       git update-index --add infocom
        echo xyzzy >infocom
 
        files=`git diff-files -p`
        test_expect_success \
-       "Racy GIT trial #$trial" \
+       "Racy GIT trial #$trial part A" \
        'test "" != "$files"'
+
+       sleep 1
+       echo xyzzy >cornerstone
+       git update-index --add cornerstone
+
+       files=`git diff-files -p`
+       test_expect_success \
+       "Racy GIT trial #$trial part B" \
+       'test "" != "$files"'
+
 done
 
 test_done