t / t1200-tutorial.shon commit reset --hard/read-tree --reset -u: remove unmerged new paths (d1a43f2)
   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
  10echo "Hello World" > hello
  11echo "Silly example" > example
  12
  13git update-index --add hello example
  14
  15test_expect_success 'blob' "test blob = \"$(git cat-file -t 557db03)\""
  16
  17test_expect_success 'blob 557db03' "test \"Hello World\" = \"$(git cat-file blob 557db03)\""
  18
  19echo "It's a new day for git" >>hello
  20cat > diff.expect << EOF
  21diff --git a/hello b/hello
  22index 557db03..263414f 100644
  23--- a/hello
  24+++ b/hello
  25@@ -1 +1,2 @@
  26 Hello World
  27+It's a new day for git
  28EOF
  29git diff-files -p > diff.output
  30test_expect_success 'git diff-files -p' 'cmp diff.expect diff.output'
  31git diff > diff.output
  32test_expect_success 'git diff' 'cmp diff.expect diff.output'
  33
  34tree=$(git write-tree 2>/dev/null)
  35
  36test_expect_success 'tree' "test 8988da15d077d4829fc51d8544c097def6644dbb = $tree"
  37
  38output="$(echo "Initial commit" | git commit-tree $(git write-tree) 2>&1 > .git/refs/heads/master)"
  39
  40git diff-index -p HEAD > diff.output
  41test_expect_success 'git diff-index -p HEAD' 'cmp diff.expect diff.output'
  42
  43git diff HEAD > diff.output
  44test_expect_success 'git diff HEAD' 'cmp diff.expect diff.output'
  45
  46#rm hello
  47#test_expect_success 'git read-tree --reset HEAD' "git read-tree --reset HEAD ; test \"hello: needs update\" = \"$(git update-index --refresh)\""
  48
  49cat > whatchanged.expect << EOF
  50commit VARIABLE
  51Author: VARIABLE
  52Date:   VARIABLE
  53
  54    Initial commit
  55
  56diff --git a/example b/example
  57new file mode 100644
  58index 0000000..f24c74a
  59--- /dev/null
  60+++ b/example
  61@@ -0,0 +1 @@
  62+Silly example
  63diff --git a/hello b/hello
  64new file mode 100644
  65index 0000000..557db03
  66--- /dev/null
  67+++ b/hello
  68@@ -0,0 +1 @@
  69+Hello World
  70EOF
  71
  72git whatchanged -p --root | \
  73        sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
  74                -e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
  75> whatchanged.output
  76test_expect_success 'git whatchanged -p --root' 'cmp whatchanged.expect whatchanged.output'
  77
  78git tag my-first-tag
  79test_expect_success 'git tag my-first-tag' 'cmp .git/refs/heads/master .git/refs/tags/my-first-tag'
  80
  81# TODO: test git clone
  82
  83git checkout -b mybranch
  84test_expect_success 'git checkout -b mybranch' 'cmp .git/refs/heads/master .git/refs/heads/mybranch'
  85
  86cat > branch.expect <<EOF
  87  master
  88* mybranch
  89EOF
  90
  91git branch > branch.output
  92test_expect_success 'git branch' 'cmp branch.expect branch.output'
  93
  94git checkout mybranch
  95echo "Work, work, work" >>hello
  96git commit -m 'Some work.' -i hello
  97
  98git checkout master
  99
 100echo "Play, play, play" >>hello
 101echo "Lots of fun" >>example
 102git commit -m 'Some fun.' -i hello example
 103
 104test_expect_success 'git resolve now fails' '
 105        test_must_fail git merge -m "Merge work in mybranch" mybranch
 106'
 107
 108cat > hello << EOF
 109Hello World
 110It's a new day for git
 111Play, play, play
 112Work, work, work
 113EOF
 114
 115git commit -m 'Merged "mybranch" changes.' -i hello
 116
 117test_done
 118
 119cat > show-branch.expect << EOF
 120* [master] Merged "mybranch" changes.
 121 ! [mybranch] Some work.
 122--
 123-  [master] Merged "mybranch" changes.
 124*+ [mybranch] Some work.
 125EOF
 126
 127git show-branch --topo-order master mybranch > show-branch.output
 128test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
 129
 130git checkout mybranch
 131
 132cat > resolve.expect << EOF
 133Updating from VARIABLE to VARIABLE
 134 example |    1 +
 135 hello   |    1 +
 136 2 files changed, 2 insertions(+), 0 deletions(-)
 137EOF
 138
 139git merge -s "Merge upstream changes." master | \
 140        sed -e "1s/[0-9a-f]\{40\}/VARIABLE/g" >resolve.output
 141test_expect_success 'git resolve' 'cmp resolve.expect resolve.output'
 142
 143cat > show-branch2.expect << EOF
 144! [master] Merged "mybranch" changes.
 145 * [mybranch] Merged "mybranch" changes.
 146--
 147-- [master] Merged "mybranch" changes.
 148EOF
 149
 150git show-branch --topo-order master mybranch > show-branch2.output
 151test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
 152
 153# TODO: test git fetch
 154
 155# TODO: test git push
 156
 157test_expect_success 'git repack' 'git repack'
 158test_expect_success 'git prune-packed' 'git prune-packed'
 159test_expect_success '-> only packed objects' '
 160        ! find -type f .git/objects/[0-9a-f][0-9a-f]
 161'
 162
 163test_done