From 04e7e69475c0b57a9838dcd6dd4a7e7b244641cb Mon Sep 17 00:00:00 2001
From: Chen Asraf <casraf@pm.me>
Date: Wed, 21 Aug 2024 15:04:44 +0300
Subject: [PATCH] fix: github find pr

---
 git-open.zsh   | 10 +++++++---
 tests/test.zsh |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/git-open.zsh b/git-open.zsh
index 8114a39..f54c63e 100755
--- a/git-open.zsh
+++ b/git-open.zsh
@@ -183,10 +183,14 @@ git_open_pr_list() {
 }
 
 git_open_new_pr() {
-  existing="$(git_find_pr $@)"
+  if [[ "$1" == "--force" || "$1" == "-f" ]]; then
+    shift
+    existing=""
+  else
+    existing="$(git_find_pr $@)"
+  fi
 
   if [[ -n "$existing" ]]; then
-    echo "PR already exists: $existing"
     open_url "$silent" $existing
     return 0
   fi
@@ -240,7 +244,7 @@ git_find_pr() {
   commit="$(git rev-parse $branch)"
 
   case "$remote_type" in
-    github) prrefs="pulls/*/head"; prfilt="pulls" ;;
+    github) prrefs="pull/*/head"; prfilt="pull" ;;
     gitlab) prrefs="merge-requests/*/head"; prfilt="merge-requests" ;;
     bitbucket) prrefs="pull-requests/*/head"; prfilt="pull-requests" ;;
   esac
diff --git a/tests/test.zsh b/tests/test.zsh
index e436dc0..cb61c63 100755
--- a/tests/test.zsh
+++ b/tests/test.zsh
@@ -76,9 +76,9 @@ describe "git_open_pr_list"
 assert_value "https://github.com/chenasraf/git-open/pulls?q=is%3Apr+is%3Aopen" $(git_open_pr_list)
 
 describe "git_open_new_pr"
-assert_value "https://github.com/chenasraf/git-open/compare/develop...master" $(git_open_new_pr master develop)
-assert_value "https://github.com/chenasraf/git-open/compare/master...develop" $(git_open_new_pr develop)
-assert_value "https://github.com/chenasraf/git-open/compare/master...$current_branch" $(git_open_new_pr)
+assert_value "https://github.com/chenasraf/git-open/compare/develop...master" $(git_open_new_pr -f master develop)
+assert_value "https://github.com/chenasraf/git-open/compare/master...develop" $(git_open_new_pr -f develop)
+assert_value "https://github.com/chenasraf/git-open/compare/master...$current_branch" $(git_open_new_pr -f)
 
 describe "git_open_pipelines"
 assert_value "https://github.com/chenasraf/git-open/actions" $(git_open_pipelines)