From 67d01672781a893a7e85faba6729ec2b9b2185d6 Mon Sep 17 00:00:00 2001 From: leo Date: Thu, 11 Jul 2024 10:55:48 +0800 Subject: [PATCH] fix: commits not marked as merged (#253) --- src/Models/CommitGraph.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Models/CommitGraph.cs b/src/Models/CommitGraph.cs index 6c6305fc..4e9bbc4d 100644 --- a/src/Models/CommitGraph.cs +++ b/src/Models/CommitGraph.cs @@ -221,13 +221,17 @@ namespace SourceGit.Models var parent = commit.Parents[j]; if (mapUnsolved.TryGetValue(parent, out var value)) { + // Try to change the merge state of linked graph var l = value; - var link = new Link(); + if (isMerged) + l.IsMerged = true; + var link = new Link(); link.Start = position; link.End = new Point(l.LastX, offsetY + HALF_HEIGHT); link.Control = new Point(link.End.X, link.Start.Y); link.Color = l.Path.Color; + temp.Links.Add(link); } else