dandavison/delta
1
1
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2024-10-05 04:17:21 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Support insteadOf replacements in git remote URLs"

Browse Source 
This reverts commit d97227ded9.
This commit is contained in:
Dan Davison 2021-08-20 17:50:49 -07:00
parent 98485fcfec
commit 3722146a25
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/options/set.rs
View File

@ -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;