summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Ramsay Jones <ramsay@ramsay1.demon.co.uk>2012-07-28 19:48:06 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-29 18:07:47 -0700
commit425b8a22aa14d624c807d5eed92c92f5cd32f376 (patch)
tree4374ef128c605a3e6b846d3739eb5b86d0207709 /merge-recursive.c
parentt: add missing executable bit to t7409 (diff)
downloadtgif-425b8a22aa14d624c807d5eed92c92f5cd32f376.tar.xz
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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions