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

Fix git_merge_analysis assert

This commit is contained in:
Aguacero 2014-05-29 09:35:48 +04:00
parent 64e9ef8863
commit 80751baa2a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge.go
View File

@ -166,7 +166,8 @@ func (r *Repository) MergeAnalysis(theirHeads []*MergeHead) (MergeAnalysis, erro
}
ptr := unsafe.Pointer(&gmerge_head_array[0])
var analysis C.git_merge_analysis_t
err := C.git_merge_analysis(&analysis, nil, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads)))
var preference C.git_merge_preference_t = C.GIT_MERGE_PREFERENCE_NONE
err := C.git_merge_analysis(&analysis, &preference, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads)))
if err < 0 {
return MergeAnalysisNone, MakeGitError(err)
}