Merge branch 'maint-1.6.5' into maint-1.6.6

[git.git] / t / t1200-tutorial.sh

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 299e72417535c2a24458cc9c4ab5dd1f193de11a..ab55eda158bb5a6ecad77302aa2fe17bd6e92be3 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -33,12 +33,12 @@ EOF
 
 test_expect_success 'git diff-files -p' '
        git diff-files -p > diff.output &&
-       cmp diff.expect diff.output
+       test_cmp diff.expect diff.output
 '
 
 test_expect_success 'git diff' '
        git diff > diff.output &&
-       cmp diff.expect diff.output
+       test_cmp diff.expect diff.output
 '
 
 test_expect_success 'tree' '
@@ -47,16 +47,17 @@ 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 &&
-       cmp diff.expect diff.output
+       test_cmp diff.expect diff.output
 '
 
 test_expect_success 'git diff HEAD' '
        git diff HEAD > diff.output &&
-       cmp diff.expect diff.output
+       test_cmp diff.expect diff.output
 '
 
 cat > whatchanged.expect << EOF
@@ -83,21 +84,21 @@ index 0000000..557db03
 EOF
 
 test_expect_success 'git whatchanged -p --root' '
-       git whatchanged -p --root | \
+       git whatchanged -p --root |
                sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
                -e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
        > whatchanged.output &&
-       cmp whatchanged.expect whatchanged.output
+       test_cmp whatchanged.expect whatchanged.output
 '
 
 test_expect_success 'git tag my-first-tag' '
        git tag my-first-tag &&
-       cmp .git/refs/heads/master .git/refs/tags/my-first-tag
+       test_cmp .git/refs/heads/master .git/refs/tags/my-first-tag
 '
 
 test_expect_success 'git checkout -b mybranch' '
        git checkout -b mybranch &&
-       cmp .git/refs/heads/master .git/refs/heads/mybranch
+       test_cmp .git/refs/heads/master .git/refs/heads/mybranch
 '
 
 cat > branch.expect <<EOF
@@ -107,18 +108,20 @@ EOF
 
 test_expect_success 'git branch' '
        git branch > branch.output &&
-       cmp branch.expect branch.output
+       test_cmp branch.expect branch.output
 '
 
 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,15 +144,16 @@ 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 &&
-       cmp show-branch.expect show-branch.output
+       test_cmp show-branch.expect show-branch.output
 '
 
 cat > resolve.expect << EOF
 Updating VARIABLE..VARIABLE
-Fast forward (no commit created; -m option ignored)
+FASTFORWARD (no commit created; -m option ignored)
  example |    1 +
  hello   |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
@@ -157,9 +161,10 @@ EOF
 
 test_expect_success 'git resolve' '
        git checkout mybranch &&
-       git merge -m "Merge upstream changes." master | \
-               sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" >resolve.output &&
-       cmp resolve.expect resolve.output
+       git merge -m "Merge upstream changes." master |
+               sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
+               -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
+       test_cmp resolve.expect resolve.output
 '
 
 cat > show-branch2.expect << EOF
@@ -171,7 +176,7 @@ EOF
 
 test_expect_success 'git show-branch (part 2)' '
        git show-branch --topo-order master mybranch > show-branch2.output &&
-       cmp show-branch2.expect show-branch2.output
+       test_cmp show-branch2.expect show-branch2.output
 '
 
 cat > show-branch3.expect << EOF
@@ -186,7 +191,7 @@ EOF
 test_expect_success 'git show-branch (part 3)' '
        git show-branch --topo-order --more=2 master mybranch \
                > show-branch3.output &&
-       cmp show-branch3.expect show-branch3.output
+       test_cmp show-branch3.expect show-branch3.output
 '
 
 test_expect_success 'rewind to "Some fun." and "Some work."' '
@@ -200,14 +205,14 @@ 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)' '
        git show-branch --topo-order > show-branch4.output &&
-       cmp show-branch4.expect show-branch4.output
+       test_cmp show-branch4.expect show-branch4.output
 '
 
 test_expect_success 'manual merge' '
@@ -227,7 +232,7 @@ EOF
 
 test_expect_success 'git ls-files --stage' '
        git ls-files --stage > ls-files.output &&
-       cmp ls-files.expect ls-files.output
+       test_cmp ls-files.expect ls-files.output
 '
 
 cat > ls-files-unmerged.expect << EOF
@@ -238,7 +243,7 @@ EOF
 
 test_expect_success 'git ls-files --unmerged' '
        git ls-files --unmerged > ls-files-unmerged.output &&
-       cmp ls-files-unmerged.expect ls-files-unmerged.output
+       test_cmp ls-files-unmerged.expect ls-files-unmerged.output
 '
 
 test_expect_success 'git-merge-index' '
@@ -247,14 +252,14 @@ test_expect_success 'git-merge-index' '
 
 test_expect_success 'git ls-files --stage (part 2)' '
        git ls-files --stage > ls-files.output2 &&
-       cmp ls-files.expect ls-files.output2
+       test_cmp ls-files.expect ls-files.output2
 '
 
 test_expect_success 'git repack' 'git repack'
 test_expect_success 'git prune-packed' 'git prune-packed'
 test_expect_success '-> only packed objects' '
        git prune && # Remove conflict marked blobs
-       ! find .git/objects/[0-9a-f][0-9a-f] -type f
+       test $(find .git/objects/[0-9a-f][0-9a-f] -type f -print 2>/dev/null | wc -l) = 0
 '
 
 test_done