diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2009-11-24 23:08:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-25 08:00:32 (GMT) |
| commit | 5d166ccb89faadb7ce5f36d2e33abbd7bb103117 (patch) | |
| tree | 7c1c61306052e75afc249a04a6199f4f7e5b8310 | |
| parent | ba2c7476882ea56fcad298ef195b538ed7a7ad32 (diff) | |
| download | git-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>
| -rw-r--r-- | Documentation/gitcore-tutorial.txt | 4 | ||||
| -rwxr-xr-x | t/t1200-tutorial.sh | 10 |
2 files changed, 9 insertions, 5 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. diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index 6bf8475..238c2f1 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -47,7 +47,8 @@ test_expect_success 'tree' ' ' test_expect_success 'git diff-index -p HEAD' ' - tree=$(git write-tree) + test_tick && + tree=$(git write-tree) && commit=$(echo "Initial commit" | git commit-tree $tree) && git update-ref HEAD $commit && git diff-index -p HEAD > diff.output && @@ -113,12 +114,14 @@ test_expect_success 'git branch' ' test_expect_success 'git resolve now fails' ' git checkout mybranch && echo "Work, work, work" >>hello && + test_tick && git commit -m "Some work." -i hello && git checkout master && echo "Play, play, play" >>hello && echo "Lots of fun" >>example && + test_tick && git commit -m "Some fun." -i hello example && test_must_fail git merge -m "Merge work in mybranch" mybranch @@ -141,6 +144,7 @@ cat > show-branch.expect << EOF EOF test_expect_success 'git show-branch' ' + test_tick && git commit -m "Merge work in mybranch" -i hello && git show-branch --topo-order --more=1 master mybranch \ > show-branch.output && @@ -201,9 +205,9 @@ cat > show-branch4.expect << EOF * [master] Some fun. ! [mybranch] Some work. -- - + [mybranch] Some work. * [master] Some fun. -*+ [mybranch^] Initial commit + + [mybranch] Some work. +*+ [master^] Initial commit EOF test_expect_success 'git show-branch (part 4)' ' |