github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-30 22:01:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: reset commit message after a merge request has been aborted

Browse Source
This commit is contained in:
leo
2024-04-29 09:30:37 +08:00
parent 1509b8ab70
commit df66bacbd2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ViewModels/InProgressContexts.cs
View File

@@ -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,

6
src/ViewModels/Repository.cs
View File

@@ -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