From 2bf98e91e5b5a7d1b18557e65711b5ef3d1a54a3 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Fri, 17 Oct 2025 09:30:35 +0100
Subject: feat(send): add `merge-base` tag to PR (Update)

following its inclusion in the NIP-34 spec
---
 src/lib/push.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/lib/push.rs')

diff --git a/src/lib/push.rs b/src/lib/push.rs
index 28692f3..aafcf35 100644
--- a/src/lib/push.rs
+++ b/src/lib/push.rs
@@ -378,6 +378,8 @@ pub async fn select_servers_push_refs_and_generate_pr_or_pr_update_event(
     git_repo: &Repo,
     repo_ref: &RepoRef,
     tip: &Sha1Hash,
+    first_commit: &Sha1Hash,
+    merge_base: Option<&Sha1Hash>,
     user_ref: &mut UserRef,
     root_proposal: Option<&Event>,
     title_description_overide: &Option<(String, String)>,
@@ -441,6 +443,8 @@ pub async fn select_servers_push_refs_and_generate_pr_or_pr_update_event(
             git_repo,
             repo_ref,
             tip,
+            first_commit,
+            merge_base,
             user_ref,
             root_proposal,
             title_description_overide,
@@ -673,6 +677,8 @@ pub async fn push_refs_and_generate_pr_or_pr_update_event(
     git_repo: &Repo,
     repo_ref: &RepoRef,
     tip: &Sha1Hash,
+    first_commit: &Sha1Hash,
+    merge_base: Option<&Sha1Hash>,
     user_ref: &UserRef,
     root_proposal: Option<&Event>,
     title_description_overide: &Option<(String, String)>,
@@ -695,6 +701,8 @@ pub async fn push_refs_and_generate_pr_or_pr_update_event(
                 root_proposal,
                 title_description_overide,
                 tip,
+                first_commit,
+                merge_base,
                 &[clone_url],
                 &[],
             )?
-- 
cgit v1.2.3