summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2009-11-24 23:08:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-25 08:00:32 (GMT)
commit5d166ccb89faadb7ce5f36d2e33abbd7bb103117 (patch)
tree7c1c61306052e75afc249a04a6199f4f7e5b8310 /git-am.sh
parentba2c7476882ea56fcad298ef195b538ed7a7ad32 (diff)
downloadgit-5d166ccb89faadb7ce5f36d2e33abbd7bb103117.zip
git-5d166ccb89faadb7ce5f36d2e33abbd7bb103117.tar.gz
git-5d166ccb89faadb7ce5f36d2e33abbd7bb103117.tar.bz2
t1200: fix a timing dependent error
The fourth test of show-branch in t1200 test was failing but only sometimes. It only failed when two commits created in an earlier test had different timestamps. When they were created within the same second, the actual output matched the expected output. Fix this by using test_tick to force reliable timestamps and update the expected output so it does not to depend on the commits made in the same sacond. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions