From 37bcbdeef2b87777cb9c3dab779de592c2f88d28 Mon Sep 17 00:00:00 2001
From: Danny Moesch <danny.moesch@icloud.com>
Date: Sat, 4 Jul 2020 22:19:01 +0200
Subject: [PATCH] Keep SwiftLint rule 'discouraged_optional_collection'
 disabled

---
 .swiftlint.yml                     |  2 +-
 passKit/Models/PasswordStore.swift | 33 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.swiftlint.yml b/.swiftlint.yml
index 250dd34..81e0313 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -33,7 +33,7 @@ whitelist_rules:
   - discouraged_direct_init
 #  - discouraged_object_literal
   - discouraged_optional_boolean
-#  - discouraged_optional_collection
+#  - discouraged_optional_collection # Too many false positives in implementations of system protocols.
   - duplicate_enum_cases
   - duplicate_imports
   - dynamic_inline
diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 6491d4a..09e4629 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -654,27 +654,26 @@ public class PasswordStore {
             throw AppError.RepositoryNotSet
         }
         // get a list of local commits
-        if let localCommits = try getLocalCommits(),
-            !localCommits.isEmpty {
-            // get the oldest local commit
-            guard let firstLocalCommit = localCommits.last,
-                firstLocalCommit.parents.count == 1,
-                let newHead = firstLocalCommit.parents.first else {
-                throw AppError.GitReset
-            }
-            try storeRepository.reset(to: newHead, resetType: .hard)
-            setAllSynced()
-            updatePasswordEntityCoreData()
-
-            NotificationCenter.default.post(name: .passwordStoreUpdated, object: nil)
-            NotificationCenter.default.post(name: .passwordStoreChangeDiscarded, object: nil)
-            return localCommits.count
-        } else {
+        let localCommits = try getLocalCommits()
+        if localCommits.isEmpty {
             return 0 // no new commit
         }
+        // get the oldest local commit
+        guard let firstLocalCommit = localCommits.last,
+            firstLocalCommit.parents.count == 1,
+            let newHead = firstLocalCommit.parents.first else {
+            throw AppError.GitReset
+        }
+        try storeRepository.reset(to: newHead, resetType: .hard)
+        setAllSynced()
+        updatePasswordEntityCoreData()
+
+        NotificationCenter.default.post(name: .passwordStoreUpdated, object: nil)
+        NotificationCenter.default.post(name: .passwordStoreChangeDiscarded, object: nil)
+        return localCommits.count
     }
 
-    private func getLocalCommits() throws -> [GTCommit]? {
+    private func getLocalCommits() throws -> [GTCommit] {
         guard let storeRepository = storeRepository else {
             throw AppError.RepositoryNotSet
         }