diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-08 17:53:42 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-08-08 17:53:42 +0100 |
| commit | a556464452789dc72cb9b0bff8e9ba6addc6639a (patch) | |
| tree | 88954d7e9b476626e447b0def0a07bc04abfe898 | |
| parent | 091f695c90158f161c54212e1951ba0d48a80b56 (diff) | |
fix(send): patch count
fix [PATCH n/n] when no cover letter and patches great than 1
fixes error where the first patch would be
[PATCH] followed by [PATCH n/n]
| -rw-r--r-- | src/sub_commands/send.rs | 2 | ||||
| -rw-r--r-- | tests/git_remote_helper.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sub_commands/send.rs b/src/sub_commands/send.rs index f10d2d3..f492734 100644 --- a/src/sub_commands/send.rs +++ b/src/sub_commands/send.rs | |||
| @@ -675,7 +675,7 @@ pub async fn generate_cover_letter_and_patch_events( | |||
| 675 | signer, | 675 | signer, |
| 676 | repo_ref, | 676 | repo_ref, |
| 677 | events.last().map(nostr::Event::id), | 677 | events.last().map(nostr::Event::id), |
| 678 | if events.is_empty() { | 678 | if events.is_empty() && commits.len().eq(&1) { |
| 679 | None | 679 | None |
| 680 | } else { | 680 | } else { |
| 681 | Some(((i + 1).try_into()?, commits.len().try_into()?)) | 681 | Some(((i + 1).try_into()?, commits.len().try_into()?)) |
diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs index 379954d..f768806 100644 --- a/tests/git_remote_helper.rs +++ b/tests/git_remote_helper.rs | |||
| @@ -1965,7 +1965,7 @@ mod push { | |||
| 1965 | 1965 | ||
| 1966 | assert!( | 1966 | assert!( |
| 1967 | revision_root_patch.content.contains("[PATCH 1/3]"), | 1967 | revision_root_patch.content.contains("[PATCH 1/3]"), |
| 1968 | "revision root labeled with [PATCH 1/3]" | 1968 | "revision root labeled with [PATCH 1/3] event: {revision_root_patch:?}", |
| 1969 | ); | 1969 | ); |
| 1970 | 1970 | ||
| 1971 | let second_patch = new_events | 1971 | let second_patch = new_events |