summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-12-20 12:12:18 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-20 12:12:18 -0800
commit407c8eb0d09d4b84bbfda9e04895a35c8fd6fef6 (patch)
treeadcc1c9a9794f69b21c5c39c9dd79520357df323 /t
parentRacy GIT (diff)
downloadtgif-407c8eb0d09d4b84bbfda9e04895a35c8fd6fef6.tar.xz
Racy GIT (part #2)
The previous round caught the most trivial case well, but broke down once index file is updated again. Smudge problematic entries (they should be very few if any under normal interactive workflow) before writing a new index file out. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t0010-racy-git.sh17
1 files changed, 13 insertions, 4 deletions
diff --git a/t/t0010-racy-git.sh b/t/t0010-racy-git.sh
index eb175b780f..e45a9e40e4 100755
--- 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