From df66bacbd29f6399ebbdd3646aaf190f849aacc7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Apr 2024 09:30:37 +0800
Subject: [PATCH] enhance: reset commit message after a merge request has been
 aborted

---
 src/ViewModels/InProgressContexts.cs | 4 ++--
 src/ViewModels/Repository.cs         | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ViewModels/InProgressContexts.cs b/src/ViewModels/InProgressContexts.cs
index e38cab13..efeedd12 100644
--- a/src/ViewModels/InProgressContexts.cs
+++ b/src/ViewModels/InProgressContexts.cs
@@ -22,9 +22,9 @@ namespace SourceGit.ViewModels
             Cmd = cmd;
         }
 
-        public void Abort()
+        public bool Abort()
         {
-            new Commands.Command()
+            return new Commands.Command()
             {
                 WorkingDirectory = Repository,
                 Context = Repository,
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 4d800a48..db35f4a9 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -511,7 +511,11 @@ namespace SourceGit.ViewModels
             if (_inProgressContext != null)
             {
                 SetWatcherEnabled(false);
-                await Task.Run(_inProgressContext.Abort);
+                var succ = await Task.Run(_inProgressContext.Abort);
+                if (succ && _workingCopy != null)
+                {
+                    _workingCopy.CommitMessage = string.Empty;
+                }
                 SetWatcherEnabled(true);
             }
             else