diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/options/set.rs | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/options/set.rs b/src/options/set.rs index c80be822..4fc0a1fd 100644 --- a/src/options/set.rs +++ b/src/options/set.rs @@ -574,13 +574,8 @@ fn set_git_config_entries(opt: &mut cli::Opt, git_config: &mut GitConfig) { // Strings for key in &["remote.origin.url"] { - // We use libgit2 Repository::find_remote() instead of using the value - // of remote.origin.url directly, in order that "insteadOf" replacements - // are honored. - // See https://git-scm.com/docs/git-config#Documentation/git-config.txt-urlltbasegtinsteadOf - // and #693 - if let Some(url) = get_remote_url(git_config) { - if let Ok(repo) = GitRemoteRepo::from_str(&url) { + if let Some(string) = git_config.get::<String>(key) { + if let Ok(repo) = GitRemoteRepo::from_str(&string) { opt.git_config_entries .insert(key.to_string(), GitConfigEntry::GitRemote(repo)); } @@ -597,18 +592,6 @@ fn set_git_config_entries(opt: &mut cli::Opt, git_config: &mut GitConfig) { } } -fn get_remote_url(git_config: &GitConfig) -> Option<String> { - Some( - git_config - .repo - .as_ref()? - .find_remote("origin") - .ok()? - .url()? - .to_owned(), - ) -} - #[cfg(test)] pub mod tests { use std::fs::remove_file; |