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

refactor: always load commit message from .git/MERGE_MSG or .git/rebase-merge/message when there is some operation in progress (#1795)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-10-23 10:59:23 +08:00
parent 1a5c63da22
commit 99389dba89
1 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/ViewModels/WorkingCopy.cs
View File

@@ -769,43 +769,54 @@ namespace SourceGit.ViewModels
private void UpdateInProgressState()
{
if (string.IsNullOrEmpty(_commitMessage))
{
var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
if (File.Exists(mergeMsgFile))
CommitMessage = File.ReadAllText(mergeMsgFile);
}
var oldType = _inProgressContext != null ? _inProgressContext.GetType() : null;
if (File.Exists(Path.Combine(_repo.GitDir, "CHERRY_PICK_HEAD")))
{
InProgressContext = new CherryPickInProgress(_repo);
}
else if (Directory.Exists(Path.Combine(_repo.GitDir, "rebase-merge")) || Directory.Exists(Path.Combine(_repo.GitDir, "rebase-apply")))
{
var rebasing = new RebaseInProgress(_repo);
InProgressContext = rebasing;
if (string.IsNullOrEmpty(_commitMessage))
{
var rebaseMsgFile = Path.Combine(_repo.GitDir, "rebase-merge", "message");
if (File.Exists(rebaseMsgFile))
CommitMessage = File.ReadAllText(rebaseMsgFile);
else if (rebasing.StoppedAt != null)
CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, rebasing.StoppedAt.SHA).GetResult();
}
}
InProgressContext = new RebaseInProgress(_repo);
else if (File.Exists(Path.Combine(_repo.GitDir, "REVERT_HEAD")))
{
InProgressContext = new RevertInProgress(_repo);
}
else if (File.Exists(Path.Combine(_repo.GitDir, "MERGE_HEAD")))
{
InProgressContext = new MergeInProgress(_repo);
}
else
{
InProgressContext = null;
}
if (_inProgressContext == null)
return;
if (_inProgressContext.GetType() == oldType && !string.IsNullOrEmpty(_commitMessage))
return;
do
{
if (LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "MERGE_MSG")))
break;
if (LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "rebase-merge", "message")))
break;
var rebaseProcessingFile = Path.Combine(_repo.GitDir, "rebase-apply", "final-commit");
if (File.Exists(rebaseProcessingFile))
{
var sha = File.ReadAllText(rebaseProcessingFile);
if (!string.IsNullOrEmpty(sha))
CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, sha).GetResult();
}
} while (false);
}
private bool LoadCommitMessageFromFile(string file)
{
if (!File.Exists(file))
return false;
var msg = File.ReadAllText(file).Trim();
if (string.IsNullOrEmpty(msg))
return false;
CommitMessage = msg;
return true;
}
private void SetDetail(Models.Change change, bool isUnstaged)