diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 18:31:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 18:31:44 +0000 |
commit | c23a457e72abe608715ac76f076f47dc42af07a5 (patch) | |
tree | 2772049aaf84b5c9d0ed12ec8d86812f7a7904b6 /vendor/gix/src/remote/init.rs | |
parent | Releasing progress-linux version 1.73.0+dfsg1-1~progress7.99u1. (diff) | |
download | rustc-c23a457e72abe608715ac76f076f47dc42af07a5.tar.xz rustc-c23a457e72abe608715ac76f076f47dc42af07a5.zip |
Merging upstream version 1.74.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix/src/remote/init.rs')
-rw-r--r-- | vendor/gix/src/remote/init.rs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/vendor/gix/src/remote/init.rs b/vendor/gix/src/remote/init.rs index bba116946..13b747eda 100644 --- a/vendor/gix/src/remote/init.rs +++ b/vendor/gix/src/remote/init.rs @@ -67,7 +67,18 @@ impl<'repo> Remote<'repo> { Url: TryInto<gix_url::Url, Error = E>, gix_url::parse::Error: From<E>, { - let url = url.try_into().map_err(|err| Error::Url(err.into()))?; + Self::from_fetch_url_inner( + url.try_into().map_err(|err| Error::Url(err.into()))?, + should_rewrite_urls, + repo, + ) + } + + fn from_fetch_url_inner( + url: gix_url::Url, + should_rewrite_urls: bool, + repo: &'repo Repository, + ) -> Result<Self, Error> { let (url_alias, _) = should_rewrite_urls .then(|| rewrite_urls(&repo.config, Some(&url), None)) .unwrap_or(Ok((None, None)))?; |