upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/bin/git_remote_nostr/push.rs
diff options
context:
space:
mode:
authorDanConwayDev <DanConwayDev@protonmail.com>2025-10-17 09:30:35 +0100
committerDanConwayDev <DanConwayDev@protonmail.com>2025-10-17 10:20:43 +0100
commit2bf98e91e5b5a7d1b18557e65711b5ef3d1a54a3 (patch)
tree0a7726ee5a6344bae6dea0f8c784548bb75b622f /src/bin/git_remote_nostr/push.rs
parent0e8fcc743b343c620a6723f5ad517ab98f140401 (diff)
feat(send): add `merge-base` tag to PR (Update)
following its inclusion in the NIP-34 spec
Diffstat (limited to 'src/bin/git_remote_nostr/push.rs')
-rw-r--r--src/bin/git_remote_nostr/push.rs6
1 files changed, 5 insertions, 1 deletions
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(
460 let use_pr = parent_is_pr || git_repo.are_commits_too_big_for_patches(ahead); 460 let use_pr = parent_is_pr || git_repo.are_commits_too_big_for_patches(ahead);
461 461
462 if use_pr { 462 if use_pr {
463 let tip = ahead.first().context("no commits")?; // ahead is youngest first
464 let first_commit = ahead.last().context("no commits")?;
463 select_servers_push_refs_and_generate_pr_or_pr_update_event( 465 select_servers_push_refs_and_generate_pr_or_pr_update_event(
464 client, 466 client,
465 git_repo, 467 git_repo,
466 repo_ref, 468 repo_ref,
467 ahead.first().context("no commits to push")?, 469 tip,
470 first_commit,
471 git_repo.get_commit_parent(first_commit).ok().as_ref(),
468 user_ref, 472 user_ref,
469 root_proposal, 473 root_proposal,
470 &None, 474 &None,