fix(ngit): improve find pr from branch

so that it only finds branch name not prefixed with `pr/` if
you are the author of the pr as there may be duplicate named prs.

2 files changed, 6 insertions, 8 deletions

diff --git a/src/bin/ngit/sub_commands/pull.rs b/src/bin/ngit/sub_commands/pull.rs
index b331dbe..eba6fc5 100644
--- a/src/bin/ngit/sub_commands/pull.rs
+++ b/src/bin/ngit/sub_commands/pull.rs
@@ -50,10 +50,9 @@ pub async fn launch() -> Result<()> {
             .iter()
             .find(|e| {
                 event_to_cover_letter(e).is_ok_and(|cl| {
-                    cl.branch_name.eq(&branch_name)
-                        || (public_key_if_known
-                            .is_some_and(|public_key| e.author().eq(&public_key))
-                            && branch_name.eq(&format!("pr/{}", cl.branch_name)))
+                    (public_key_if_known.is_some_and(|public_key| e.author().eq(&public_key))
+                        && (branch_name.eq(&format!("pr/{}", cl.branch_name))
+                            || cl.branch_name.eq(&branch_name)))
                         || cl.get_branch_name().is_ok_and(|s| s.eq(&branch_name))
                 }) && !event_is_revision_root(e)
             })
diff --git a/src/bin/ngit/sub_commands/push.rs b/src/bin/ngit/sub_commands/push.rs
index 3ec6ff9..7cdc655 100644
--- a/src/bin/ngit/sub_commands/push.rs
+++ b/src/bin/ngit/sub_commands/push.rs
@@ -66,10 +66,9 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
             .iter()
             .find(|e| {
                 event_to_cover_letter(e).is_ok_and(|cl| {
-                    cl.branch_name.eq(&branch_name)
-                        || (public_key_if_known
-                            .is_some_and(|public_key| e.author().eq(&public_key))
-                            && branch_name.eq(&format!("pr/{}", cl.branch_name)))
+                    (public_key_if_known.is_some_and(|public_key| e.author().eq(&public_key))
+                        && (branch_name.eq(&format!("pr/{}", cl.branch_name))
+                            || cl.branch_name.eq(&branch_name)))
                         || cl.get_branch_name().is_ok_and(|s| s.eq(&branch_name))
                 }) && !event_is_revision_root(e)
             })