michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
Show stats 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; Cmd = cmd;
} }
public void Abort() public bool Abort()
{ {
new Commands.Command() return new Commands.Command()
{ {
WorkingDirectory = Repository, WorkingDirectory = Repository,
Context = Repository, Context = Repository,

6
src/ViewModels/Repository.cs
View file

@ -511,7 +511,11 @@ namespace SourceGit.ViewModels
if (_inProgressContext != null) if (_inProgressContext != null)
{ {
SetWatcherEnabled(false); SetWatcherEnabled(false);
await Task.Run(_inProgressContext.Abort); var succ = await Task.Run(_inProgressContext.Abort);
if (succ && _workingCopy != null)
{
_workingCopy.CommitMessage = string.Empty;
}
SetWatcherEnabled(true); SetWatcherEnabled(true);
} }
else else