michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: commits not marked as merged (#253)

Browse source
This commit is contained in:
leo 2024-07-11 10:55:48 +08:00
parent e5462f0086
commit 67d0167278
No known key found for this signature in database
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Models/CommitGraph.cs
View file

@ -221,13 +221,17 @@ namespace SourceGit.Models
var parent = commit.Parents[j]; var parent = commit.Parents[j];
if (mapUnsolved.TryGetValue(parent, out var value)) if (mapUnsolved.TryGetValue(parent, out var value))
{ {
// Try to change the merge state of linked graph
var l = value; var l = value;
var link = new Link(); if (isMerged)
l.IsMerged = true;
var link = new Link();
link.Start = position; link.Start = position;
link.End = new Point(l.LastX, offsetY + HALF_HEIGHT); link.End = new Point(l.LastX, offsetY + HALF_HEIGHT);
link.Control = new Point(link.End.X, link.Start.Y); link.Control = new Point(link.End.X, link.Start.Y);
link.Color = l.Path.Color; link.Color = l.Path.Color;
temp.Links.Add(link); temp.Links.Add(link);
} }
else else