t1200: cleanup and modernize test style
Many parts of the tests in t1200 are run outside the test harness,
circumventing the usefulness of -v and spewing messages to stdout when
-v isn't used. Fix these problems by modernizing the test a bit.
An extra test_done has existed since commit 6a74642 (git-commit --amend:
two fixes., 2006-04-20) leading to the last 6 tests never being run.
Remove it and teach the resolve merge test about fast-forward merges.
Also fix the last test's incorrect find command and prune before
checking for unpacked objects so we remove the unreachable conflict-marked
blob.
Finally, we remove the TODO notes, because fetch, push, and clone have
their own tests since t1200 was introduced and we're not going to add
them here 4 years later.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stephen Boyd
Junio C Hamano
parent
1b52ac5935
commit
1a994dc3d2
@ -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,33 @@ 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 &&
|
||||
cmp diff.expect diff.output
|
||||
'
|
||||
|
||||
test_expect_success 'tree' "test 8988da15d077d4829fc51d8544c097def6644dbb = $tree"
|
||||
test_expect_success 'git diff' '
|
||||
git diff > diff.output &&
|
||||
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' '
|
||||
echo "Initial commit" | \
|
||||
git commit-tree $(git write-tree) 2>&1 > .git/refs/heads/master &&
|
||||
git diff-index -p HEAD > diff.output &&
|
||||
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 &&
|
||||
cmp diff.expect diff.output
|
||||
'
|
||||
|
||||
cat > whatchanged.expect << EOF
|
||||
commit VARIABLE
|
||||
@ -69,39 +81,45 @@ index 0000000..557db03
|
||||
+Hello World
|
||||
EOF
|
||||
|
||||
git whatchanged -p --root | \
|
||||
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 &&
|
||||
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 &&
|
||||
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 &&
|
||||
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 &&
|
||||
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,10 +130,6 @@ 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.
|
||||
! [mybranch] Some work.
|
||||
@ -124,21 +138,26 @@ cat > show-branch.expect << EOF
|
||||
*+ [mybranch] Some work.
|
||||
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 "Merged \"mybranch\" changes." -i hello &&
|
||||
git show-branch --topo-order master mybranch > show-branch.output &&
|
||||
cmp show-branch.expect show-branch.output
|
||||
'
|
||||
|
||||
cat > resolve.expect << EOF
|
||||
Updating from VARIABLE to VARIABLE
|
||||
Updating VARIABLE..VARIABLE
|
||||
Fast forward (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" >resolve.output &&
|
||||
cmp resolve.expect resolve.output
|
||||
'
|
||||
|
||||
cat > show-branch2.expect << EOF
|
||||
! [master] Merged "mybranch" changes.
|
||||
@ -147,17 +166,16 @@ cat > show-branch2.expect << EOF
|
||||
-- [master] Merged "mybranch" changes.
|
||||
EOF
|
||||
|
||||
git show-branch --topo-order master mybranch > show-branch2.output
|
||||
test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
|
||||
|
||||
# TODO: test git fetch
|
||||
|
||||
# TODO: test git push
|
||||
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_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