merge_test.go


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23

package git

import (
	"testing"
)

func TestMergeWithSelf(t *testing.T) {

	repo := createTestRepo(t)
	seedTestRepo(t, repo)

	master, err := repo.LookupReference("refs/heads/master")
	checkFatal(t, err)

	mergeHead, err := repo.MergeHeadFromRef(master)
	checkFatal(t, err)

	options, _ := DefaultMergeOptions()
	mergeHeads := make([]*MergeHead, 1)
	mergeHeads[0] = mergeHead
	err = repo.Merge(mergeHeads, &options, nil)
	checkFatal(t, err)
}