From 5a4402ce83094d797f7c2c8780dbc35e0d738dec Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 12 Dec 2024 12:49:34 +0000
Subject: fix(push): three-way `merge-commit-id` `tag`

should alway list only the three-way merge commit id.
---
 src/bin/git_remote_nostr/push.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 4066312..93127fb 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -1104,11 +1104,11 @@ async fn create_merge_events(
                 } else {
                     None
                 },
-                if merged_patches
-                    .values()
-                    .any(|m| m == &MergedPRCommitType::MergeCommit)
+                if let Some((commit, _)) = merged_patches
+                    .iter()
+                    .find(|(_, m)| **m == MergedPRCommitType::MergeCommit)
                 {
-                    vec![*merged_patches.keys().next().unwrap()]
+                    vec![*commit]
                 } else {
                     let mut t: Vec<Sha1Hash> = merged_patches.keys().copied().collect();
                     t.reverse();
-- 
cgit v1.2.3