git2go/merge_test.go

23 lines
402 B
Go
Raw Normal View History

package git
import (
"testing"
)
2014-03-26 13:28:48 -05:00
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)
mergeHeads := make([]*MergeHead, 1)
mergeHeads[0] = mergeHead
2014-03-26 14:17:23 -05:00
err = repo.Merge(mergeHeads, nil, nil)
checkFatal(t, err)
}