From 2bf98e91e5b5a7d1b18557e65711b5ef3d1a54a3 Mon Sep 17 00:00:00 2001 From: DanConwayDev 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/bin/git_remote_nostr/push.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/bin/git_remote_nostr/push.rs') diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs index 8c102ee..8a750ce 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs @@ -460,11 +460,15 @@ async fn generate_patches_or_pr_event_or_pr_updates( let use_pr = parent_is_pr || git_repo.are_commits_too_big_for_patches(ahead); if use_pr { + let tip = ahead.first().context("no commits")?; // ahead is youngest first + let first_commit = ahead.last().context("no commits")?; select_servers_push_refs_and_generate_pr_or_pr_update_event( client, git_repo, repo_ref, - ahead.first().context("no commits to push")?, + tip, + first_commit, + git_repo.get_commit_parent(first_commit).ok().as_ref(), user_ref, root_proposal, &None, -- cgit v1.2.3