summaryrefslogtreecommitdiff
path: root/t/t1100-commit-tree-options.sh
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2012-07-28 18:48:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-30 01:07:47 (GMT)
commit425b8a22aa14d624c807d5eed92c92f5cd32f376 (patch)
tree4374ef128c605a3e6b846d3739eb5b86d0207709 /t/t1100-commit-tree-options.sh
parent07a71b851a2910931d307c884195d130f3462962 (diff)
downloadgit-425b8a22aa14d624c807d5eed92c92f5cd32f376.zip
git-425b8a22aa14d624c807d5eed92c92f5cd32f376.tar.gz
git-425b8a22aa14d624c807d5eed92c92f5cd32f376.tar.bz2
t1100-*.sh: Fix an intermittent test failure
In particular, the final test ('flags and then non flags') fails intermittently, depending on how much time elapsed between the invocations of "git commit-tree" when creating the commits which later have their commit id's compared. For example, if the commits for childid-3 and childid-4 are created 1 or more seconds apart, then the commits, which would otherwise be identical, will have different commit id's. In order to make the test reproducible, we remove the variability by setting the author and committer times to a well defined state. We accomplish this with a single call to 'test_tick' at the start of the test. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1100-commit-tree-options.sh')
-rwxr-xr-xt/t1100-commit-tree-options.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh
index a3b7723..f8457f9 100755
--- a/t/t1100-commit-tree-options.sh
+++ b/t/t1100-commit-tree-options.sh
@@ -47,6 +47,7 @@ test_expect_success \
test_expect_success 'flags and then non flags' '
+ test_tick &&
echo comment text |
git commit-tree $(cat treeid) >commitid &&
echo comment text |