t / t1200-tutorial.shon commit Merge commit 'v1.7.5' into svn-fe (59445b0)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Johannes Schindelin
   4#
   5
   6test_description='A simple turial in the form of a test case'
   7
   8. ./test-lib.sh
   9
  10test_expect_success 'blob'  '
  11        echo "Hello World" > hello &&
  12        echo "Silly example" > example &&
  13
  14        git update-index --add hello example &&
  15
  16        test blob = "$(git cat-file -t 557db03)"
  17'
  18
  19test_expect_success 'blob 557db03' '
  20        test "Hello World" = "$(git cat-file blob 557db03)"
  21'
  22
  23echo "It's a new day for git" >>hello
  24cat > diff.expect << EOF
  25diff --git a/hello b/hello
  26index 557db03..263414f 100644
  27--- a/hello
  28+++ b/hello
  29@@ -1 +1,2 @@
  30 Hello World
  31+It's a new day for git
  32EOF
  33
  34test_expect_success 'git diff-files -p' '
  35        git diff-files -p > diff.output &&
  36        test_cmp diff.expect diff.output
  37'
  38
  39test_expect_success 'git diff' '
  40        git diff > diff.output &&
  41        test_cmp diff.expect diff.output
  42'
  43
  44test_expect_success 'tree' '
  45        tree=$(git write-tree 2>/dev/null) &&
  46        test 8988da15d077d4829fc51d8544c097def6644dbb = $tree
  47'
  48
  49test_expect_success 'git diff-index -p HEAD' '
  50        test_tick &&
  51        tree=$(git write-tree) &&
  52        commit=$(echo "Initial commit" | git commit-tree $tree) &&
  53        git update-ref HEAD $commit &&
  54        git diff-index -p HEAD > diff.output &&
  55        test_cmp diff.expect diff.output
  56'
  57
  58test_expect_success 'git diff HEAD' '
  59        git diff HEAD > diff.output &&
  60        test_cmp diff.expect diff.output
  61'
  62
  63cat > whatchanged.expect << EOF
  64commit VARIABLE
  65Author: VARIABLE
  66Date:   VARIABLE
  67
  68    Initial commit
  69
  70diff --git a/example b/example
  71new file mode 100644
  72index 0000000..f24c74a
  73--- /dev/null
  74+++ b/example
  75@@ -0,0 +1 @@
  76+Silly example
  77diff --git a/hello b/hello
  78new file mode 100644
  79index 0000000..557db03
  80--- /dev/null
  81+++ b/hello
  82@@ -0,0 +1 @@
  83+Hello World
  84EOF
  85
  86test_expect_success 'git whatchanged -p --root' '
  87        git whatchanged -p --root |
  88                sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
  89                -e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
  90        > whatchanged.output &&
  91        test_cmp whatchanged.expect whatchanged.output
  92'
  93
  94test_expect_success 'git tag my-first-tag' '
  95        git tag my-first-tag &&
  96        test_cmp .git/refs/heads/master .git/refs/tags/my-first-tag
  97'
  98
  99test_expect_success 'git checkout -b mybranch' '
 100        git checkout -b mybranch &&
 101        test_cmp .git/refs/heads/master .git/refs/heads/mybranch
 102'
 103
 104cat > branch.expect <<EOF
 105  master
 106* mybranch
 107EOF
 108
 109test_expect_success 'git branch' '
 110        git branch > branch.output &&
 111        test_cmp branch.expect branch.output
 112'
 113
 114test_expect_success 'git resolve now fails' '
 115        git checkout mybranch &&
 116        echo "Work, work, work" >>hello &&
 117        test_tick &&
 118        git commit -m "Some work." -i hello &&
 119
 120        git checkout master &&
 121
 122        echo "Play, play, play" >>hello &&
 123        echo "Lots of fun" >>example &&
 124        test_tick &&
 125        git commit -m "Some fun." -i hello example &&
 126
 127        test_must_fail git merge -m "Merge work in mybranch" mybranch
 128'
 129
 130cat > hello << EOF
 131Hello World
 132It's a new day for git
 133Play, play, play
 134Work, work, work
 135EOF
 136
 137cat > show-branch.expect << EOF
 138* [master] Merge work in mybranch
 139 ! [mybranch] Some work.
 140--
 141-  [master] Merge work in mybranch
 142*+ [mybranch] Some work.
 143*  [master^] Some fun.
 144EOF
 145
 146test_expect_success 'git show-branch' '
 147        test_tick &&
 148        git commit -m "Merge work in mybranch" -i hello &&
 149        git show-branch --topo-order --more=1 master mybranch \
 150                > show-branch.output &&
 151        test_cmp show-branch.expect show-branch.output
 152'
 153
 154cat > resolve.expect << EOF
 155Updating VARIABLE..VARIABLE
 156FASTFORWARD (no commit created; -m option ignored)
 157 example |    1 +
 158 hello   |    1 +
 159 2 files changed, 2 insertions(+), 0 deletions(-)
 160EOF
 161
 162test_expect_success 'git resolve' '
 163        git checkout mybranch &&
 164        git merge -m "Merge upstream changes." master |
 165                sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
 166                -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
 167'
 168
 169test_expect_success C_LOCALE_OUTPUT 'git resolve output' '
 170        test_cmp resolve.expect resolve.output
 171'
 172
 173cat > show-branch2.expect << EOF
 174! [master] Merge work in mybranch
 175 * [mybranch] Merge work in mybranch
 176--
 177-- [master] Merge work in mybranch
 178EOF
 179
 180test_expect_success 'git show-branch (part 2)' '
 181        git show-branch --topo-order master mybranch > show-branch2.output &&
 182        test_cmp show-branch2.expect show-branch2.output
 183'
 184
 185cat > show-branch3.expect << EOF
 186! [master] Merge work in mybranch
 187 * [mybranch] Merge work in mybranch
 188--
 189-- [master] Merge work in mybranch
 190+* [master^2] Some work.
 191+* [master^] Some fun.
 192EOF
 193
 194test_expect_success 'git show-branch (part 3)' '
 195        git show-branch --topo-order --more=2 master mybranch \
 196                > show-branch3.output &&
 197        test_cmp show-branch3.expect show-branch3.output
 198'
 199
 200test_expect_success 'rewind to "Some fun." and "Some work."' '
 201        git checkout mybranch &&
 202        git reset --hard master^2 &&
 203        git checkout master &&
 204        git reset --hard master^
 205'
 206
 207cat > show-branch4.expect << EOF
 208* [master] Some fun.
 209 ! [mybranch] Some work.
 210--
 211*  [master] Some fun.
 212 + [mybranch] Some work.
 213*+ [master^] Initial commit
 214EOF
 215
 216test_expect_success 'git show-branch (part 4)' '
 217        git show-branch --topo-order > show-branch4.output &&
 218        test_cmp show-branch4.expect show-branch4.output
 219'
 220
 221test_expect_success 'manual merge' '
 222        mb=$(git merge-base HEAD mybranch) &&
 223        git name-rev --name-only --tags $mb > name-rev.output &&
 224        test "my-first-tag" = $(cat name-rev.output) &&
 225
 226        git read-tree -m -u $mb HEAD mybranch
 227'
 228
 229cat > ls-files.expect << EOF
 230100644 7f8b141b65fdcee47321e399a2598a235a032422 0       example
 231100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1       hello
 232100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2       hello
 233100644 cc44c73eb783565da5831b4d820c962954019b69 3       hello
 234EOF
 235
 236test_expect_success 'git ls-files --stage' '
 237        git ls-files --stage > ls-files.output &&
 238        test_cmp ls-files.expect ls-files.output
 239'
 240
 241cat > ls-files-unmerged.expect << EOF
 242100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1       hello
 243100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2       hello
 244100644 cc44c73eb783565da5831b4d820c962954019b69 3       hello
 245EOF
 246
 247test_expect_success 'git ls-files --unmerged' '
 248        git ls-files --unmerged > ls-files-unmerged.output &&
 249        test_cmp ls-files-unmerged.expect ls-files-unmerged.output
 250'
 251
 252test_expect_success 'git-merge-index' '
 253        test_must_fail git merge-index git-merge-one-file hello
 254'
 255
 256test_expect_success 'git ls-files --stage (part 2)' '
 257        git ls-files --stage > ls-files.output2 &&
 258        test_cmp ls-files.expect ls-files.output2
 259'
 260
 261test_expect_success 'git repack' 'git repack'
 262test_expect_success 'git prune-packed' 'git prune-packed'
 263test_expect_success '-> only packed objects' '
 264        git prune && # Remove conflict marked blobs
 265        test $(find .git/objects/[0-9a-f][0-9a-f] -type f -print 2>/dev/null | wc -l) = 0
 266'
 267
 268test_done