Merge pull request #694 from dandavison/693-remote-urls

Support `insteadOf` replacements in git remote URLs

1 files changed, 18 insertions, 3 deletions

diff --git a/src/features/hyperlinks.rs b/src/features/hyperlinks.rs
index bf0c2354..2d3ad3b0 100644
--- a/src/features/hyperlinks.rs
+++ b/src/features/hyperlinks.rs
@@ -1,11 +1,12 @@
 use std::borrow::Cow;
+use std::str::FromStr;
 
 use lazy_static::lazy_static;
 use regex::{Captures, Regex};
 
 use crate::config::Config;
 use crate::features::OptionValueFunction;
-use crate::git_config::{GitConfigEntry, GitRemoteRepo};
+use crate::git_config::{GitConfig, GitConfigEntry, GitRemoteRepo};
 
 pub fn make_feature() -> Vec<(String, OptionValueFunction)> {
     builtin_feature!([
@@ -28,16 +29,30 @@ pub fn format_commit_line_with_osc8_commit_hyperlink<'a>(
             format_osc8_hyperlink(&commit_link_format.replace("{commit}", commit), commit)
         })
     } else if let Some(GitConfigEntry::GitRemote(GitRemoteRepo::GitHubRepo(repo))) =
-        config.git_config_entries.get("remote.origin.url")
+        config.git_config.as_ref().and_then(get_remote_url)
     {
         COMMIT_LINE_REGEX.replace(line, |captures: &Captures| {
-            format_commit_line_captures_with_osc8_commit_hyperlink(captures, repo)
+            format_commit_line_captures_with_osc8_commit_hyperlink(captures, &repo)
         })
     } else {
         Cow::from(line)
     }
 }
 
+fn get_remote_url(git_config: &GitConfig) -> Option<GitConfigEntry> {
+    git_config
+        .repo
+        .as_ref()?
+        .find_remote("origin")
+        .ok()?
+        .url()
+        .and_then(|url| {
+            GitRemoteRepo::from_str(url)
+                .ok()
+                .map(GitConfigEntry::GitRemote)
+        })
+}
+
 /// Create a file hyperlink to `path`, displaying `text`.
 pub fn format_osc8_file_hyperlink<'a>(
     relative_path: &'a str,