jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

support nil merge options

This commit is contained in:
Jesse Ezell 2014-03-26 12:17:23 -07:00
parent 50a3c4aa09
commit eff3a8b4d0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
merge.go
View File

@ -146,7 +146,7 @@ func (r *Repository) Merge(theirHeads []*MergeHead, mergeOptions *MergeOptions,
return nil return nil
} }
func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options MergeOptions) (*Index, error) { func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options *MergeOptions) (*Index, error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
@ -162,7 +162,7 @@ func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options MergeOpt
return idx, nil return idx, nil
} }
func (r *Repository) MergeTrees(ancestor *Tree, ours *Tree, theirs *Tree, options MergeOptions) (*Index, error) { func (r *Repository) MergeTrees(ancestor *Tree, ours *Tree, theirs *Tree, options *MergeOptions) (*Index, error) {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()

3
merge_test.go
View File

@ -15,9 +15,8 @@ func TestMergeWithSelf(t *testing.T) {
mergeHead, err := repo.MergeHeadFromRef(master) mergeHead, err := repo.MergeHeadFromRef(master)
checkFatal(t, err) checkFatal(t, err)
options, _ := DefaultMergeOptions()
mergeHeads := make([]*MergeHead, 1) mergeHeads := make([]*MergeHead, 1)
mergeHeads[0] = mergeHead mergeHeads[0] = mergeHead
err = repo.Merge(mergeHeads, &options, nil) err = repo.Merge(mergeHeads, nil, nil)
checkFatal(t, err) checkFatal(t, err)
} }