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

Polish logic of setting git signature

Browse source
This commit is contained in:
Mingshen Sun 2017-04-27 21:48:10 -07:00
parent 8d0553a417
commit b429a6baf1
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
4 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pass/Models/PasswordStore.swift
View file

@ -84,9 +84,14 @@ class PasswordStore {
var gitSignatureForNow: GTSignature {
get {
let name = Defaults[.gitName] ?? Defaults[.gitUsername] ?? "user"
let email = Defaults[.gitEmail] ?? ((Defaults[.gitUsername] ?? "user") + "@passforios")
return GTSignature(name: name, email: email, time: Date())!
if let gitConfigUserName = Defaults[.gitConfigUserName],
let gitConfigUserEmail = Defaults[.gitConfigUserEmail] {
return GTSignature(name: gitConfigUserName, email: gitConfigUserEmail, time: Date())!
} else {
let name = Defaults[.gitUsername] ?? "user"
let email = (Defaults[.gitUsername] ?? "user") + "@passforios"
return GTSignature(name: name, email: email, time: Date())!
}
}
}