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: restore original commit message if target commit changed from pending target to normal reword/edit

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-10-30 10:42:01 +08:00
parent e7f391f511
commit 14a5aa5f28
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ViewModels/InteractiveRebase.cs
View File

@@ -386,6 +386,7 @@ namespace SourceGit.ViewModels
if (item.Action == Models.InteractiveRebaseAction.Reword ||
item.Action == Models.InteractiveRebaseAction.Edit)
{
var oldPendingType = item.PendingType;
item.IsFullMessageUsed = true;
item.ShowEditMessageButton = true;
item.PendingType = hasPending ? Models.InteractiveRebasePendingType.Target : Models.InteractiveRebasePendingType.None;
@@ -405,6 +406,11 @@ namespace SourceGit.ViewModels
hasPending = false;
pendingMessages.Clear();
}
else if (oldPendingType == Models.InteractiveRebasePendingType.Target)
{
if (!item.IsMessageUserEdited)
item.FullMessage = item.OriginalFullMessage;
}
continue;
}

2
src/Views/InteractiveRebase.axaml.cs
View File

@@ -113,7 +113,7 @@ namespace SourceGit.Views
return;
var startW = 4;
var endW = Bounds.Width - 4;
var endW = Bounds.Width - 6;
var height = Bounds.Height;
var halfH = height * 0.5;
var fill = Fill;