Skip to content

Commit 86169b7

Browse files
committed
enhance: always try to load commit message from $GIT_DIR/MERGE_MSG (#1915)
Signed-off-by: leo <[email protected]>
1 parent c4bcc5e commit 86169b7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/ViewModels/WorkingCopy.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,10 @@ private void UpdateInProgressState()
776776
InProgressContext = null;
777777

778778
if (_inProgressContext == null)
779+
{
780+
LoadCommitMessageFromFile(Path.Combine(_repo.GitDir, "MERGE_MSG"))
779781
return;
782+
}
780783

781784
if (_inProgressContext.GetType() == oldType && !string.IsNullOrEmpty(_commitMessage))
782785
return;

0 commit comments

Comments
 (0)