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

refactor: rewrite the way to load commit message from $GIT_DIR for in-progress action

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-11-17 16:49:35 +08:00
parent b09d7b86e6
commit 59758903b3
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ViewModels/WorkingCopy.cs
View File

@@ -769,26 +769,19 @@ namespace SourceGit.ViewModels
else
InProgressContext = null;
if (_inProgressContext == null)
{
LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "MERGE_MSG"));
return;
}
if (_inProgressContext.GetType() == oldType && !string.IsNullOrEmpty(_commitMessage))
if (_inProgressContext != null && _inProgressContext.GetType() == oldType && !string.IsNullOrEmpty(_commitMessage))
return;
do
{
if (LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "MERGE_MSG")))
break;
if (LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "MERGE_MSG")))
return;
if (LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "rebase-merge", "message")))
break;
if (_inProgressContext is not RebaseInProgress { } rebasing)
return;
if (_inProgressContext is RebaseInProgress { StoppedAt: { } stopAt })
CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, stopAt.SHA).GetResult();
} while (false);
if (LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "rebase-merge", "message")))
return;
CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, rebasing.StoppedAt.SHA).GetResult();
}
private bool LoadCommitMessageFromFile(string file)