From 642e07b099d05b494752995e0b72c5dda717aadc Mon Sep 17 00:00:00 2001 From: glushchenko Date: Thu, 1 Jun 2023 17:27:10 +0300 Subject: [PATCH] #1535 --- FSNotes.xcodeproj/project.pbxproj | 16 ++++++++-------- FSNotes/ViewController+Git.swift | 11 +++++++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/FSNotes.xcodeproj/project.pbxproj b/FSNotes.xcodeproj/project.pbxproj index 37dcdf985..18f1f1d7b 100644 --- a/FSNotes.xcodeproj/project.pbxproj +++ b/FSNotes.xcodeproj/project.pbxproj @@ -5038,7 +5038,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 575; + CURRENT_PROJECT_VERSION = 576; DEVELOPMENT_TEAM = 866P6MTE92; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; ENABLE_HARDENED_RUNTIME = YES; @@ -5055,7 +5055,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 6.3.1; + MARKETING_VERSION = 6.3.2; PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes; PRODUCT_NAME = FSNotes; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -5077,7 +5077,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 575; + CURRENT_PROJECT_VERSION = 576; DEPLOYMENT_LOCATION = NO; DEVELOPMENT_TEAM = 866P6MTE92; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; @@ -5095,7 +5095,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 6.3.1; + MARKETING_VERSION = 6.3.2; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes; PRODUCT_NAME = FSNotes; @@ -5440,7 +5440,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 575; + CURRENT_PROJECT_VERSION = 576; DEVELOPMENT_TEAM = 866P6MTE92; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; ENABLE_NS_ASSERTIONS = NO; @@ -5456,7 +5456,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 6.3.1; + MARKETING_VERSION = 6.3.2; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes; PRODUCT_NAME = FSNotes; @@ -5478,7 +5478,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 575; + CURRENT_PROJECT_VERSION = 576; DEPLOYMENT_LOCATION = NO; DEVELOPMENT_TEAM = 866P6MTE92; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; @@ -5495,7 +5495,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 6.3.1; + MARKETING_VERSION = 6.3.2; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes; PRODUCT_NAME = FSNotes; diff --git a/FSNotes/ViewController+Git.swift b/FSNotes/ViewController+Git.swift index a5e2e07b8..18affe83b 100644 --- a/FSNotes/ViewController+Git.swift +++ b/FSNotes/ViewController+Git.swift @@ -68,11 +68,18 @@ extension EditorViewController { do { try note.project.saveRevision(commitMessage: commitMessage) } catch { + var message = String() + if let error = error as? GitError { + message = error.associatedValue() + } else { + message = error.localizedDescription + } + DispatchQueue.main.async { let alert = NSAlert() alert.alertStyle = .critical - alert.informativeText = NSLocalizedString("Git error", comment: "") - alert.messageText = error.localizedDescription + alert.informativeText = message + alert.messageText = NSLocalizedString("Git error", comment: "") alert.beginSheetModal(for: window) { (returnCode: NSApplication.ModalResponse) -> Void in } } }