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

enhance: save commit message to .git/MERGE_MSG while closing repo with in-progress state (#1795)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-10-24 10:23:36 +08:00
parent 5c75bb86bb
commit 81f622b4b1
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ViewModels/Repository.cs
View File

@@ -567,7 +567,11 @@ namespace SourceGit.ViewModels
if (!_isWorktree)
{
_settings.LastCommitMessage = _workingCopy.CommitMessage;
if (_workingCopy.InProgressContext != null && !string.IsNullOrEmpty(_workingCopy.CommitMessage))
File.WriteAllText(Path.Combine(GitDir, "MERGE_MSG"), _workingCopy.CommitMessage);
else
_settings.LastCommitMessage = _workingCopy.CommitMessage;
using var stream = File.Create(Path.Combine(_gitCommonDir, "sourcegit.settings"));
JsonSerializer.Serialize(stream, _settings, JsonCodeGen.Default.RepositorySettings);
}

9
src/ViewModels/WorkingCopy.cs
View File

@@ -796,13 +796,8 @@ namespace SourceGit.ViewModels
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();
}
if (_inProgressContext is RebaseInProgress { StoppedAt: { } stopAt })
CommitMessage = new Commands.QueryCommitFullMessage(_repo.FullPath, stopAt.SHA).GetResult();
} while (false);
}