vhad/SwiftGit2
1
0
Fork 0
mirror of https://github.com/gosticks/SwiftGit2.git synced 2025-10-16 11:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

be more clear with naming and additional guard

Browse Source
This commit is contained in:
Yifei Teng 2018-05-01 13:39:36 -05:00
parent f229778abb
commit 3db2d73e6e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SwiftGit2/Repository.swift
View File

@ -635,16 +635,20 @@ final public class Repository {
git_message_prettify(&msgBuf, message, 0, /* ascii for # */ 35) git_message_prettify(&msgBuf, message, 0, /* ascii for # */ 35)
defer { git_buf_free(&msgBuf) } defer { git_buf_free(&msgBuf) }
// use HEAD as parent // libgit2 expects a C-like array of parent git_commit pointer
var parentC: [OpaquePointer?] = [] var parentGitCommits: [OpaquePointer?] = []
for parentCommit in parents { for parentCommit in parents {
var parent: OpaquePointer? = nil var parent: OpaquePointer? = nil
var oid = parentCommit.oid.oid var oid = parentCommit.oid.oid
git_commit_lookup(&parent, self.pointer, &oid) let lookupResult = git_commit_lookup(&parent, self.pointer, &oid)
parentC.append(parent!) guard lookupResult == GIT_OK.rawValue else {
let err = NSError(gitError: lookupResult, pointOfFailure: "git_commit_lookup")
return .failure(err)
}
parentGitCommits.append(parent!)
} }
let parentsContiguous = ContiguousArray(parentC) let parentsContiguous = ContiguousArray(parentGitCommits)
return parentsContiguous.withUnsafeBufferPointer { unsafeBuffer in return parentsContiguous.withUnsafeBufferPointer { unsafeBuffer in
var commitOID = git_oid() var commitOID = git_oid()
let parentsPtr = UnsafeMutablePointer(mutating: unsafeBuffer.baseAddress) let parentsPtr = UnsafeMutablePointer(mutating: unsafeBuffer.baseAddress)