diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2025-07-23 16:27:50 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2025-07-23 16:27:50 +0100 |
| commit | 3a3f8c877d060f7510b79f32233e2bd2574de4c1 (patch) | |
| tree | 398c0cee321fa4ae508e34a47159aa94bf98133b | |
| parent | bbdd2093506b31359ab1ff61b709e40de043c879 (diff) | |
fix(remote): dont send pr and patches on upgrade
when an upgrade to a pr is needed, dont also try and send patches
| -rw-r--r-- | src/bin/git_remote_nostr/push.rs | 45 |
1 files changed, 23 insertions, 22 deletions
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( | |||
| 382 | { | 382 | { |
| 383 | events.push(event); | 383 | events.push(event); |
| 384 | } | 384 | } |
| 385 | } | 385 | } else { |
| 386 | for (i, commit) in ahead.iter().enumerate() { | 386 | for (i, commit) in ahead.iter().enumerate() { |
| 387 | let new_patch = generate_patch_event( | 387 | let new_patch = generate_patch_event( |
| 388 | git_repo, | 388 | git_repo, |
| 389 | &git_repo.get_root_commit()?, | 389 | &git_repo.get_root_commit()?, |
| 390 | commit, | 390 | commit, |
| 391 | Some(thread_id), | 391 | Some(thread_id), |
| 392 | signer, | 392 | signer, |
| 393 | repo_ref, | 393 | repo_ref, |
| 394 | Some(parent_patch.id), | 394 | Some(parent_patch.id), |
| 395 | Some(( | 395 | Some(( |
| 396 | (patches.len() + i + 1).try_into().unwrap(), | 396 | (patches.len() + i + 1).try_into().unwrap(), |
| 397 | (patches.len() + ahead.len()).try_into().unwrap(), | 397 | (patches.len() + ahead.len()).try_into().unwrap(), |
| 398 | )), | 398 | )), |
| 399 | None, | 399 | None, |
| 400 | &None, | 400 | &None, |
| 401 | &[], | 401 | &[], |
| 402 | ) | 402 | ) |
| 403 | .await | 403 | .await |
| 404 | .context("failed to make patch event from commit")?; | 404 | .context("failed to make patch event from commit")?; |
| 405 | events.push(new_patch.clone()); | 405 | events.push(new_patch.clone()); |
| 406 | parent_patch = new_patch; | 406 | parent_patch = new_patch; |
| 407 | } | ||
| 407 | } | 408 | } |
| 408 | } else { | 409 | } else { |
| 409 | // we shouldn't get here | 410 | // we shouldn't get here |