merge: remove whitespace change
This commit is contained in:
parent
a1f25eafec
commit
ddbf1baab1
4
merge.go
4
merge.go
|
@ -265,8 +265,8 @@ func (r *Repository) MergeBases(one, two *Oid) ([]*Oid, error) {
|
||||||
oids := make([]*Oid, coids.count)
|
oids := make([]*Oid, coids.count)
|
||||||
hdr := reflect.SliceHeader {
|
hdr := reflect.SliceHeader {
|
||||||
Data: uintptr(unsafe.Pointer(coids.ids)),
|
Data: uintptr(unsafe.Pointer(coids.ids)),
|
||||||
Len: int(coids.count),
|
Len: int(coids.count),
|
||||||
Cap: int(coids.count),
|
Cap: int(coids.count),
|
||||||
}
|
}
|
||||||
|
|
||||||
goSlice := *(*[]C.git_oid)(unsafe.Pointer(&hdr))
|
goSlice := *(*[]C.git_oid)(unsafe.Pointer(&hdr))
|
||||||
|
|
Loading…
Reference in New Issue