From e1776b8bb6e020f8f6d03432141476a73aa25665 Mon Sep 17 00:00:00 2001 From: kyler <95313103+senyc@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:57:13 -0400 Subject: [PATCH 1/2] feat: default to git config remote, as this takes into account different host names --- lua/litee/gh/gitcli/init.lua | 7 +++++++ lua/litee/gh/pr/state.lua | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lua/litee/gh/gitcli/init.lua b/lua/litee/gh/gitcli/init.lua index 7851150..405fd4d 100644 --- a/lua/litee/gh/gitcli/init.lua +++ b/lua/litee/gh/gitcli/init.lua @@ -138,4 +138,11 @@ function M.git_reset_hard(remote, branch) return out end +function M.get_git_remote() + local out = git_exec([[git config --get remote.origin.url]]) + if out == nil then + return nil + end + return out +end return M diff --git a/lua/litee/gh/pr/state.lua b/lua/litee/gh/pr/state.lua index 7d96369..c0acb45 100644 --- a/lua/litee/gh/pr/state.lua +++ b/lua/litee/gh/pr/state.lua @@ -529,7 +529,14 @@ function M.get_pr_remote_url() if protocol == 'https' then remote_url = M.pull_state.pr_raw['head']['repo']['clone_url'] else - remote_url = M.pull_state.pr_raw['head']['repo']['ssh_url'] + -- Defaults to git remote if set + local git_origin_url = gitcli.get_git_remote() + if git_origin_url ~= nil then + remote_url = git_origin_url + else + remote_url = M.pull_state.pr_raw['head']['repo']['ssh_url'] + end + end return remote_url From 39018780d524279af8014e9330efa40b17ccb554 Mon Sep 17 00:00:00 2001 From: kyler <95313103+senyc@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:18:11 -0400 Subject: [PATCH 2/2] fix: correct accidental inclusion of newline in get_git_remote --- lua/litee/gh/gitcli/init.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/litee/gh/gitcli/init.lua b/lua/litee/gh/gitcli/init.lua index 405fd4d..adb9a50 100644 --- a/lua/litee/gh/gitcli/init.lua +++ b/lua/litee/gh/gitcli/init.lua @@ -143,6 +143,7 @@ function M.get_git_remote() if out == nil then return nil end - return out + return out:gsub("\n", "") end + return M