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

handles, merge, odb: changes for Go 1.6 pointer passing rules #282

Merged
ianlancetaylor merged 5 commits from master into master 2016-02-18 06:10:08 -06:00
Conversation 3 Commits 5 Files Changed 4 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ddbf1baab1 - Show all commits

4
merge.go
View File

@ -265,8 +265,8 @@ func (r *Repository) MergeBases(one, two *Oid) ([]*Oid, error) {
oids := make([]*Oid, coids.count)
hdr := reflect.SliceHeader {
Data: uintptr(unsafe.Pointer(coids.ids)),
Len: int(coids.count),
Cap: int(coids.count),
Len: int(coids.count),
Cap: int(coids.count),
}
goSlice := *(*[]C.git_oid)(unsafe.Pointer(&hdr))