path: root/Documentation/gitcore-tutorial.txt
diff options
authorNanako Shiraishi <>2009-11-24 23:08:08 (GMT)
committerJunio C Hamano <>2009-11-25 08:00:32 (GMT)
commit5d166ccb89faadb7ce5f36d2e33abbd7bb103117 (patch)
tree7c1c61306052e75afc249a04a6199f4f7e5b8310 /Documentation/gitcore-tutorial.txt
parentba2c7476882ea56fcad298ef195b538ed7a7ad32 (diff)
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 <>
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index b7380b0..e237394 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.