From 5d166ccb89faadb7ce5f36d2e33abbd7bb103117 Mon Sep 17 00:00:00 2001 From: Nanako Shiraishi Date: Wed, 25 Nov 2009 08:08:08 +0900 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/gitcore-tutorial.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/gitcore-tutorial.txt') diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index b7380b069a..e237394397 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -1186,9 +1186,9 @@ $ git show-branch * [master] Some fun. ! [mybranch] Some work. -- - + [mybranch] Some work. * [master] Some fun. -*+ [mybranch^] Initial commit + + [mybranch] Some work. +*+ [master^] Initial commit ------------ Now we are ready to experiment with the merge by hand. -- cgit v1.2.3