From 3a3f8c877d060f7510b79f32233e2bd2574de4c1 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Wed, 23 Jul 2025 16:27:50 +0100 Subject: fix(remote): dont send pr and patches on upgrade when an upgrade to a pr is needed, dont also try and send patches --- src/bin/git_remote_nostr/push.rs | 45 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (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 b997ea7..e694e18 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs @@ -382,28 +382,29 @@ async fn process_proposal_refspecs( { events.push(event); } - } - for (i, commit) in ahead.iter().enumerate() { - let new_patch = generate_patch_event( - git_repo, - &git_repo.get_root_commit()?, - commit, - Some(thread_id), - signer, - repo_ref, - Some(parent_patch.id), - Some(( - (patches.len() + i + 1).try_into().unwrap(), - (patches.len() + ahead.len()).try_into().unwrap(), - )), - None, - &None, - &[], - ) - .await - .context("failed to make patch event from commit")?; - events.push(new_patch.clone()); - parent_patch = new_patch; + } else { + for (i, commit) in ahead.iter().enumerate() { + let new_patch = generate_patch_event( + git_repo, + &git_repo.get_root_commit()?, + commit, + Some(thread_id), + signer, + repo_ref, + Some(parent_patch.id), + Some(( + (patches.len() + i + 1).try_into().unwrap(), + (patches.len() + ahead.len()).try_into().unwrap(), + )), + None, + &None, + &[], + ) + .await + .context("failed to make patch event from commit")?; + events.push(new_patch.clone()); + parent_patch = new_patch; + } } } else { // we shouldn't get here -- cgit v1.2.3