diff options
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/git_remote_nostr/push.rs | 6 | ||||
| -rw-r--r-- | src/bin/ngit/sub_commands/send.rs | 6 |
2 files changed, 10 insertions, 2 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, |
diff --git a/src/bin/ngit/sub_commands/send.rs b/src/bin/ngit/sub_commands/send.rs index 0e4a572..6ae0cda 100644 --- a/src/bin/ngit/sub_commands/send.rs +++ b/src/bin/ngit/sub_commands/send.rs | |||
| @@ -206,11 +206,15 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re | |||
| 206 | commits.reverse(); | 206 | commits.reverse(); |
| 207 | 207 | ||
| 208 | let events = if as_pr { | 208 | let events = if as_pr { |
| 209 | let tip = commits.last().context("no commits")?; // commits has been reversed to oldest first | ||
| 210 | let first_commit = commits.first().context("no commits")?; | ||
| 209 | select_servers_push_refs_and_generate_pr_or_pr_update_event( | 211 | select_servers_push_refs_and_generate_pr_or_pr_update_event( |
| 210 | &client, | 212 | &client, |
| 211 | &git_repo, | 213 | &git_repo, |
| 212 | &repo_ref, | 214 | &repo_ref, |
| 213 | commits.last().context("no commits")?, | 215 | tip, |
| 216 | first_commit, | ||
| 217 | git_repo.get_commit_parent(first_commit).ok().as_ref(), | ||
| 214 | &mut user_ref, | 218 | &mut user_ref, |
| 215 | root_proposal.as_ref(), | 219 | root_proposal.as_ref(), |
| 216 | &cover_letter_title_description, | 220 | &cover_letter_title_description, |