Log commit failures more clearly

geluk · Jan 22, 2021 · aa65463 · aa65463
1 parent e2232e8
commit aa65463
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/pass-winmenu/src/Actions/CommitChangesAction.cs b/pass-winmenu/src/Actions/CommitChangesAction.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using LibGit2Sharp;
 using PassWinmenu.Configuration;
 using PassWinmenu.ExternalPrograms;
@@ -34,8 +35,19 @@ public void Execute()
 				return;
 			}
 
-			// First, commit any uncommitted files
-			syncService.Commit();
+			try
+			{
+				// First, commit any uncommitted files
+				syncService.Commit();
+			}
+			catch (Exception e)
+			{
+				notificationService.ShowErrorWindow(
+					$"Unable to commit your changes. An error occurred: {e.GetType().Name} ({e.Message})");
+				Log.ReportException(e);
+				return;
+			}
+
 			// Now fetch the latest changes
 			try
 			{