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

enhance: always try to load commit message from $GIT_DIR/MERGE_MSG (#1915)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-11-13 18:10:17 +08:00
parent c4bcc5e174
commit 562f21df6f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ViewModels/WorkingCopy.cs
View File

@@ -776,7 +776,10 @@ namespace SourceGit.ViewModels
InProgressContext = null;
if (_inProgressContext == null)
{
LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "MERGE_MSG"));
return;
}
if (_inProgressContext.GetType() == oldType && !string.IsNullOrEmpty(_commitMessage))
return;