lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Fix #326: Do not assume 'master' as the default checked out branch

Browse source
This commit is contained in:
Danny Moesch 2019-11-07 23:25:46 +01:00 • committed by Mingshen Sun
parent de88b27d1a
commit 4c47729a6e
4 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
passKit/Models/PasswordStore.swift
View file

@ -189,7 +189,9 @@ public class PasswordStore {
storeRepository = try GTRepository.clone(from: remoteRepoURL, toWorkingDirectory: tempStoreURL, options: options, transferProgressBlock:transferProgressBlock)
try fm.moveItem(at: tempStoreURL, to: storeURL)
storeRepository = try GTRepository(url: storeURL)
try checkoutAndChangeBranch(withName: branchName)
if (try? storeRepository?.currentBranch().name) != branchName {
try checkoutAndChangeBranch(withName: branchName)
}
} catch {
credential.delete()
DispatchQueue.main.async {
@ -207,9 +209,6 @@ public class PasswordStore {
}
private func checkoutAndChangeBranch(withName localBranchName: String) throws {
if (localBranchName == "master") {
return
}
guard let storeRepository = storeRepository else {
throw AppError.RepositoryNotSet
}