diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-07-23 16:36:06 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-07-23 16:36:06 +0100 |
| commit | b67376ff54abeab31422921ba5f4883d5d3dccdb (patch) | |
| tree | d4f4194fdf2d285332dd7aacea31678042389b00 /src/sub_commands/pull.rs | |
| parent | 643fa17fde858c2d6f934dcc435eb84843cc172e (diff) | |
feat(list): unique proposal branch names
to prevent accidental name conflicts. also moved to prs/* namespace
`pull` and `push` integration tests are intermitantly failing to end
at least for `push` they work when run individually but not
when run together
Diffstat (limited to 'src/sub_commands/pull.rs')
| -rw-r--r-- | src/sub_commands/pull.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sub_commands/pull.rs b/src/sub_commands/pull.rs index dfa6f89..e33a744 100644 --- a/src/sub_commands/pull.rs +++ b/src/sub_commands/pull.rs | |||
| @@ -50,7 +50,8 @@ pub async fn launch() -> Result<()> { | |||
| 50 | .await? | 50 | .await? |
| 51 | .iter() | 51 | .iter() |
| 52 | .find(|e| { | 52 | .find(|e| { |
| 53 | event_to_cover_letter(e).is_ok_and(|cl| cl.branch_name.eq(&branch_name)) | 53 | event_to_cover_letter(e) |
| 54 | .is_ok_and(|cl| cl.get_branch_name().is_ok_and(|s| s.eq(&branch_name))) | ||
| 54 | && !event_is_revision_root(e) | 55 | && !event_is_revision_root(e) |
| 55 | }) | 56 | }) |
| 56 | .context("cannot find proposal that matches the current branch name")? | 57 | .context("cannot find proposal that matches the current branch name")? |