From e5946d4009cf58f7a041f647e953a454159e2d4f Mon Sep 17 00:00:00 2001 From: Jesse Ezell Date: Fri, 28 Feb 2014 14:33:38 -0800 Subject: Add defaults, add simple test, merge heads should be pointer array --- merge.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'merge.go') 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() -- cgit v1.2.3