From 65e0cfdf1f98ccd1b947de1b70f89a3b8839c1d6 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Fri, 18 May 2018 19:05:43 +0800 Subject: [PATCH] Fix the oid error introduced by the latest ObjectiveGit --- passKit/Models/PasswordStore.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index 5ae5692..0ace0f9 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 oid = try storeRepository.headReference().targetOID { + try enumerator.pushSHA(oid.sha) } for _ in 0 ..< count { let commit = try enumerator.nextObject(withSuccess: nil) @@ -554,7 +554,9 @@ 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!) + if let oid = headReference.targetOID { + try commitEnum.pushSHA(oid.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)