Add defaults, add simple test, merge heads should be pointer array

1 files changed, 11 insertions, 1 deletions

diff --git a/merge.go b/merge.go
index 570c361..59cdd58 100644
--- a/merge.go
+++ b/merge.go
@@ -85,6 +85,12 @@ type MergeOptions struct {
 	//TODO: CheckoutOptions CheckoutOptions
 }
 
+func DefaultMergeOptions() MergeOptions {
+	options := MergeOptions{Version: 1}
+	options.TreeOptions = DefaultMergeTreeOptions()
+	return options
+}
+
 func (mo *MergeOptions) toC() *C.git_merge_opts {
 	return &C.git_merge_opts{
 		version:         C.uint(mo.Version),
@@ -117,6 +123,10 @@ type MergeTreeOptions struct {
 	FileFavor MergeFileFavorType
 }
 
+func DefaultMergeTreeOptions() MergeTreeOptions {
+	return MergeTreeOptions{Version: 1}
+}
+
 func (mo *MergeTreeOptions) toC() *C.git_merge_tree_opts {
 	return &C.git_merge_tree_opts{
 		version:          C.uint(mo.Version),
@@ -170,7 +180,7 @@ func (mr *MergeResult) FastForwardId() (*Oid, error) {
 	return newOidFromC(&oid), nil
 }
 
-func (r *Repository) Merge(theirHeads []MergeHead, options MergeOptions) (*MergeResult, error) {
+func (r *Repository) Merge(theirHeads []*MergeHead, options MergeOptions) (*MergeResult, error) {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()