From eabebe1a53fcf3426fcca1a67e512f8651539050 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Sun, 27 May 2018 15:33:36 -0700 Subject: [PATCH] Revert "Fix the oid error introduced by the latest ObjectiveGit" This reverts commit 65e0cfdf1f98ccd1b947de1b70f89a3b8839c1d6. --- passKit/Models/PasswordStore.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift index 0ace0f9..5ae5692 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 oid = try storeRepository.headReference().targetOID { - try enumerator.pushSHA(oid.sha) + if let sha = try storeRepository.headReference().targetOID.sha { + try enumerator.pushSHA(sha) } for _ in 0 ..< count { let commit = try enumerator.nextObject(withSuccess: nil) @@ -554,9 +554,7 @@ public class PasswordStore { let newTree = try storeRepository.index().writeTree() let headReference = try storeRepository.headReference() let commitEnum = try GTEnumerator(repository: storeRepository) - if let oid = headReference.targetOID { - try commitEnum.pushSHA(oid.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)