From: Ramsay Jones Date: Sat, 28 Jul 2012 18:48:06 +0000 (+0100) Subject: t1100-*.sh: Fix an intermittent test failure X-Git-Tag: v1.7.12-rc1~6 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=425b8a22aa14d624c807d5eed92c92f5cd32f376;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t1100-commit-tree-options.sh b/t/t1100-commit-tree-options.sh index a3b77239f..f8457f9d1 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 |