Method TestMergeFF

repository_test.go:443–488

(c *C)

}

func (s *RepositorySuite) TestMergeFF(c *C) {
	r, err := Init(memory.NewStorage(), memfs.New())
	c.Assert(err, IsNil)
	c.Assert(r, NotNil)

	createCommit(c, r)
	createCommit(c, r)
	createCommit(c, r)
	lastCommit := createCommit(c, r)

	wt, err := r.Worktree()
	c.Assert(err, IsNil)

	targetBranch := plumbing.NewBranchReferenceName("foo")
	err = wt.Checkout(&CheckoutOptions{
		Hash:   lastCommit,
		Create: true,
		Branch: targetBranch,
	})
	c.Assert(err, IsNil)

	createCommit(c, r)
	fooHash := createCommit(c, r)

	// Checkout the master branch so that we can try to merge foo into it.
	err = wt.Checkout(&CheckoutOptions{
		Branch: plumbing.Master,
	})
	c.Assert(err, IsNil)

	head, err := r.Head()
	c.Assert(err, IsNil)
	c.Assert(head.Hash(), Equals, lastCommit)

	targetRef := plumbing.NewHashReference(targetBranch, fooHash)
	c.Assert(targetRef, NotNil)

	err = r.Merge(*targetRef, MergeOptions{
		Strategy: FastForwardMerge,
	})
	c.Assert(err, IsNil)

	head, err = r.Head()
	c.Assert(err, IsNil)
	c.Assert(head.Hash(), Equals, fooHash)
}

func (s *RepositorySuite) TestMergeFF_Invalid(c *C) {
	r, err := Init(memory.NewStorage(), memfs.New())