Merge branch 'sb/tutorial-test'
* sb/tutorial-test: t1200: prepare for merging with Fast-forward bikeshedding t1200: further modernize test script style t1200: Make documentation and test agree t1200: cleanup and modernize test style
This commit is contained in:
Junio C Hamano
commit
aa17bacc14
@ -185,7 +185,7 @@ object is. git will tell you that you have a "blob" object (i.e., just a
|
||||
regular file), and you can see the contents with
|
||||
|
||||
----------------
|
||||
$ git cat-file "blob" 557db03
|
||||
$ git cat-file blob 557db03
|
||||
----------------
|
||||
|
||||
which will print out "Hello World". The object `557db03` is nothing
|
||||
@ -1188,7 +1188,7 @@ $ git show-branch
|
||||
--
|
||||
+ [mybranch] Some work.
|
||||
* [master] Some fun.
|
||||
*+ [mybranch^] New day.
|
||||
*+ [mybranch^] Initial commit
|
||||
------------
|
||||
|
||||
Now we are ready to experiment with the merge by hand.
|
||||
@ -1204,11 +1204,11 @@ $ mb=$(git merge-base HEAD mybranch)
|
||||
The command writes the commit object name of the common ancestor
|
||||
to the standard output, so we captured its output to a variable,
|
||||
because we will be using it in the next step. By the way, the common
|
||||
ancestor commit is the "New day." commit in this case. You can
|
||||
ancestor commit is the "Initial commit" commit in this case. You can
|
||||
tell it by:
|
||||
|
||||
------------
|
||||
$ git name-rev $mb
|
||||
$ git name-rev --name-only --tags $mb
|
||||
my-first-tag
|
||||
------------
|
||||
|
||||
@ -1237,8 +1237,8 @@ inspect the index file with this command:
|
||||
------------
|
||||
$ git ls-files --stage
|
||||
100644 7f8b141b65fdcee47321e399a2598a235a032422 0 example
|
||||
100644 263414f423d0e4d70dae8fe53fa34614ff3e2860 1 hello
|
||||
100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello
|
||||
100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1 hello
|
||||
100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2 hello
|
||||
100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
|
||||
------------
|
||||
|
||||
@ -1253,8 +1253,8 @@ To look at only non-zero stages, use `\--unmerged` flag:
|
||||
|
||||
------------
|
||||
$ git ls-files --unmerged
|
||||
100644 263414f423d0e4d70dae8fe53fa34614ff3e2860 1 hello
|
||||
100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello
|
||||
100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1 hello
|
||||
100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2 hello
|
||||
100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
|
||||
------------
|
||||
|
||||
@ -1283,8 +1283,8 @@ the working tree.. This can be seen if you run `ls-files
|
||||
------------
|
||||
$ git ls-files --stage
|
||||
100644 7f8b141b65fdcee47321e399a2598a235a032422 0 example
|
||||
100644 263414f423d0e4d70dae8fe53fa34614ff3e2860 1 hello
|
||||
100644 06fa6a24256dc7e560efa5687fa84b51f0263c3a 2 hello
|
||||
100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1 hello
|
||||
100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2 hello
|
||||
100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
|
||||
------------
|
||||
|
||||
|
||||
@ -7,14 +7,18 @@ test_description='A simple turial in the form of a test case'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
echo "Hello World" > hello
|
||||
echo "Silly example" > example
|
||||
test_expect_success 'blob' '
|
||||
echo "Hello World" > hello &&
|
||||
echo "Silly example" > example &&
|
||||
|
||||
git update-index --add hello example
|
||||
git update-index --add hello example &&
|
||||
|
||||
test_expect_success 'blob' "test blob = \"$(git cat-file -t 557db03)\""
|
||||
test blob = "$(git cat-file -t 557db03)"
|
||||
'
|
||||
|
||||
test_expect_success 'blob 557db03' "test \"Hello World\" = \"$(git cat-file blob 557db03)\""
|
||||
test_expect_success 'blob 557db03' '
|
||||
test "Hello World" = "$(git cat-file blob 557db03)"
|
||||
'
|
||||
|
||||
echo "It's a new day for git" >>hello
|
||||
cat > diff.expect << EOF
|
||||
@ -26,25 +30,34 @@ index 557db03..263414f 100644
|
||||
Hello World
|
||||
+It's a new day for git
|
||||
EOF
|
||||
git diff-files -p > diff.output
|
||||
test_expect_success 'git diff-files -p' 'cmp diff.expect diff.output'
|
||||
git diff > diff.output
|
||||
test_expect_success 'git diff' 'cmp diff.expect diff.output'
|
||||
|
||||
tree=$(git write-tree 2>/dev/null)
|
||||
test_expect_success 'git diff-files -p' '
|
||||
git diff-files -p > diff.output &&
|
||||
test_cmp diff.expect diff.output
|
||||
'
|
||||
|
||||
test_expect_success 'tree' "test 8988da15d077d4829fc51d8544c097def6644dbb = $tree"
|
||||
test_expect_success 'git diff' '
|
||||
git diff > diff.output &&
|
||||
test_cmp diff.expect diff.output
|
||||
'
|
||||
|
||||
output="$(echo "Initial commit" | git commit-tree $(git write-tree) 2>&1 > .git/refs/heads/master)"
|
||||
test_expect_success 'tree' '
|
||||
tree=$(git write-tree 2>/dev/null)
|
||||
test 8988da15d077d4829fc51d8544c097def6644dbb = $tree
|
||||
'
|
||||
|
||||
git diff-index -p HEAD > diff.output
|
||||
test_expect_success 'git diff-index -p HEAD' 'cmp diff.expect diff.output'
|
||||
test_expect_success 'git diff-index -p HEAD' '
|
||||
tree=$(git write-tree)
|
||||
commit=$(echo "Initial commit" | git commit-tree $tree) &&
|
||||
git update-ref HEAD $commit &&
|
||||
git diff-index -p HEAD > diff.output &&
|
||||
test_cmp diff.expect diff.output
|
||||
'
|
||||
|
||||
git diff HEAD > diff.output
|
||||
test_expect_success 'git diff HEAD' 'cmp diff.expect diff.output'
|
||||
|
||||
#rm hello
|
||||
#test_expect_success 'git read-tree --reset HEAD' "git read-tree --reset HEAD ; test \"hello: needs update\" = \"$(git update-index --refresh)\""
|
||||
test_expect_success 'git diff HEAD' '
|
||||
git diff HEAD > diff.output &&
|
||||
test_cmp diff.expect diff.output
|
||||
'
|
||||
|
||||
cat > whatchanged.expect << EOF
|
||||
commit VARIABLE
|
||||
@ -69,39 +82,45 @@ index 0000000..557db03
|
||||
+Hello World
|
||||
EOF
|
||||
|
||||
git whatchanged -p --root | \
|
||||
sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
|
||||
test_expect_success 'git whatchanged -p --root' '
|
||||
git whatchanged -p --root |
|
||||
sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
|
||||
-e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
|
||||
> whatchanged.output
|
||||
test_expect_success 'git whatchanged -p --root' 'cmp whatchanged.expect whatchanged.output'
|
||||
> whatchanged.output &&
|
||||
test_cmp whatchanged.expect whatchanged.output
|
||||
'
|
||||
|
||||
git tag my-first-tag
|
||||
test_expect_success 'git tag my-first-tag' 'cmp .git/refs/heads/master .git/refs/tags/my-first-tag'
|
||||
test_expect_success 'git tag my-first-tag' '
|
||||
git tag my-first-tag &&
|
||||
test_cmp .git/refs/heads/master .git/refs/tags/my-first-tag
|
||||
'
|
||||
|
||||
# TODO: test git clone
|
||||
|
||||
git checkout -b mybranch
|
||||
test_expect_success 'git checkout -b mybranch' 'cmp .git/refs/heads/master .git/refs/heads/mybranch'
|
||||
test_expect_success 'git checkout -b mybranch' '
|
||||
git checkout -b mybranch &&
|
||||
test_cmp .git/refs/heads/master .git/refs/heads/mybranch
|
||||
'
|
||||
|
||||
cat > branch.expect <<EOF
|
||||
master
|
||||
* mybranch
|
||||
EOF
|
||||
|
||||
git branch > branch.output
|
||||
test_expect_success 'git branch' 'cmp branch.expect branch.output'
|
||||
|
||||
git checkout mybranch
|
||||
echo "Work, work, work" >>hello
|
||||
git commit -m 'Some work.' -i hello
|
||||
|
||||
git checkout master
|
||||
|
||||
echo "Play, play, play" >>hello
|
||||
echo "Lots of fun" >>example
|
||||
git commit -m 'Some fun.' -i hello example
|
||||
test_expect_success 'git branch' '
|
||||
git branch > branch.output &&
|
||||
test_cmp branch.expect branch.output
|
||||
'
|
||||
|
||||
test_expect_success 'git resolve now fails' '
|
||||
git checkout mybranch &&
|
||||
echo "Work, work, work" >>hello &&
|
||||
git commit -m "Some work." -i hello &&
|
||||
|
||||
git checkout master &&
|
||||
|
||||
echo "Play, play, play" >>hello &&
|
||||
echo "Lots of fun" >>example &&
|
||||
git commit -m "Some fun." -i hello example &&
|
||||
|
||||
test_must_fail git merge -m "Merge work in mybranch" mybranch
|
||||
'
|
||||
|
||||
@ -112,52 +131,131 @@ Play, play, play
|
||||
Work, work, work
|
||||
EOF
|
||||
|
||||
git commit -m 'Merged "mybranch" changes.' -i hello
|
||||
|
||||
test_done
|
||||
|
||||
cat > show-branch.expect << EOF
|
||||
* [master] Merged "mybranch" changes.
|
||||
* [master] Merge work in mybranch
|
||||
! [mybranch] Some work.
|
||||
--
|
||||
- [master] Merged "mybranch" changes.
|
||||
- [master] Merge work in mybranch
|
||||
*+ [mybranch] Some work.
|
||||
* [master^] Some fun.
|
||||
EOF
|
||||
|
||||
git show-branch --topo-order master mybranch > show-branch.output
|
||||
test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
|
||||
|
||||
git checkout mybranch
|
||||
test_expect_success 'git show-branch' '
|
||||
git commit -m "Merge work in mybranch" -i hello &&
|
||||
git show-branch --topo-order --more=1 master mybranch \
|
||||
> show-branch.output &&
|
||||
test_cmp show-branch.expect show-branch.output
|
||||
'
|
||||
|
||||
cat > resolve.expect << EOF
|
||||
Updating from VARIABLE to VARIABLE
|
||||
Updating VARIABLE..VARIABLE
|
||||
FASTFORWARD (no commit created; -m option ignored)
|
||||
example | 1 +
|
||||
hello | 1 +
|
||||
2 files changed, 2 insertions(+), 0 deletions(-)
|
||||
EOF
|
||||
|
||||
git merge -s "Merge upstream changes." master | \
|
||||
sed -e "1s/[0-9a-f]\{40\}/VARIABLE/g" >resolve.output
|
||||
test_expect_success 'git resolve' 'cmp resolve.expect resolve.output'
|
||||
test_expect_success 'git resolve' '
|
||||
git checkout mybranch &&
|
||||
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
|
||||
! [master] Merged "mybranch" changes.
|
||||
* [mybranch] Merged "mybranch" changes.
|
||||
! [master] Merge work in mybranch
|
||||
* [mybranch] Merge work in mybranch
|
||||
--
|
||||
-- [master] Merged "mybranch" changes.
|
||||
-- [master] Merge work in mybranch
|
||||
EOF
|
||||
|
||||
git show-branch --topo-order master mybranch > show-branch2.output
|
||||
test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
|
||||
test_expect_success 'git show-branch (part 2)' '
|
||||
git show-branch --topo-order master mybranch > show-branch2.output &&
|
||||
test_cmp show-branch2.expect show-branch2.output
|
||||
'
|
||||
|
||||
# TODO: test git fetch
|
||||
cat > show-branch3.expect << EOF
|
||||
! [master] Merge work in mybranch
|
||||
* [mybranch] Merge work in mybranch
|
||||
--
|
||||
-- [master] Merge work in mybranch
|
||||
+* [master^2] Some work.
|
||||
+* [master^] Some fun.
|
||||
EOF
|
||||
|
||||
# TODO: test git push
|
||||
test_expect_success 'git show-branch (part 3)' '
|
||||
git show-branch --topo-order --more=2 master mybranch \
|
||||
> show-branch3.output &&
|
||||
test_cmp show-branch3.expect show-branch3.output
|
||||
'
|
||||
|
||||
test_expect_success 'rewind to "Some fun." and "Some work."' '
|
||||
git checkout mybranch &&
|
||||
git reset --hard master^2 &&
|
||||
git checkout master &&
|
||||
git reset --hard master^
|
||||
'
|
||||
|
||||
cat > show-branch4.expect << EOF
|
||||
* [master] Some fun.
|
||||
! [mybranch] Some work.
|
||||
--
|
||||
+ [mybranch] Some work.
|
||||
* [master] Some fun.
|
||||
*+ [mybranch^] Initial commit
|
||||
EOF
|
||||
|
||||
test_expect_success 'git show-branch (part 4)' '
|
||||
git show-branch --topo-order > show-branch4.output &&
|
||||
test_cmp show-branch4.expect show-branch4.output
|
||||
'
|
||||
|
||||
test_expect_success 'manual merge' '
|
||||
mb=$(git merge-base HEAD mybranch) &&
|
||||
git name-rev --name-only --tags $mb > name-rev.output &&
|
||||
test "my-first-tag" = $(cat name-rev.output) &&
|
||||
|
||||
git read-tree -m -u $mb HEAD mybranch
|
||||
'
|
||||
|
||||
cat > ls-files.expect << EOF
|
||||
100644 7f8b141b65fdcee47321e399a2598a235a032422 0 example
|
||||
100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1 hello
|
||||
100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2 hello
|
||||
100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
|
||||
EOF
|
||||
|
||||
test_expect_success 'git ls-files --stage' '
|
||||
git ls-files --stage > ls-files.output &&
|
||||
test_cmp ls-files.expect ls-files.output
|
||||
'
|
||||
|
||||
cat > ls-files-unmerged.expect << EOF
|
||||
100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1 hello
|
||||
100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2 hello
|
||||
100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
|
||||
EOF
|
||||
|
||||
test_expect_success 'git ls-files --unmerged' '
|
||||
git ls-files --unmerged > ls-files-unmerged.output &&
|
||||
test_cmp ls-files-unmerged.expect ls-files-unmerged.output
|
||||
'
|
||||
|
||||
test_expect_success 'git-merge-index' '
|
||||
test_must_fail git merge-index git-merge-one-file hello
|
||||
'
|
||||
|
||||
test_expect_success 'git ls-files --stage (part 2)' '
|
||||
git ls-files --stage > 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' '
|
||||
! find -type f .git/objects/[0-9a-f][0-9a-f]
|
||||
git prune && # Remove conflict marked blobs
|
||||
! find .git/objects/[0-9a-f][0-9a-f] -type f
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user