From 6ab976ad82a9a6b02cb0d7d62fb14d73fadbd295 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Fri, 15 Jun 2018 11:37:59 -0700 Subject: [PATCH] Use master objective-git cause it include the latest libgit2-0.27 --- Cartfile | 2 +- passKit/Models/PasswordStore.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index 7dd6ed1..02c4a5a 100644 --- a/Cartfile +++ b/Cartfile @@ -1,6 +1,6 @@ github "SVProgressHUD/SVProgressHUD" github "radex/SwiftyUserDefaults" -github "libgit2/objective-git" "0.13.0" +github "libgit2/objective-git" "master" github "leonbreedt/FavIcon" github "kishikawakatsumi/KeychainAccess" github "mattrubin/OneTimePassword" diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index 5ae5692..3d3cac0 100644 --- a/passKit/Models/PasswordStore.swift +++ b/passKit/Models/PasswordStore.swift @@ -411,8 +411,8 @@ public class PasswordStore { } var commits = [GTCommit]() let enumerator = try GTEnumerator(repository: storeRepository) - if let sha = try storeRepository.headReference().targetOID.sha { - try enumerator.pushSHA(sha) + if let targetOID = try storeRepository.headReference().targetOID { + try enumerator.pushSHA(targetOID.sha) } for _ in 0 ..< count { let commit = try enumerator.nextObject(withSuccess: nil) @@ -554,7 +554,7 @@ public class PasswordStore { let newTree = try storeRepository.index().writeTree() let headReference = try storeRepository.headReference() let commitEnum = try GTEnumerator(repository: storeRepository) - try commitEnum.pushSHA(headReference.targetOID.sha!) + try commitEnum.pushSHA(headReference.targetOID!.sha) let parent = commitEnum.nextObject() as! GTCommit let signature = gitSignatureForNow let commit = try storeRepository.createCommit(with: newTree, message: message, author: signature, committer: signature, parents: [parent], updatingReferenceNamed: headReference.name)