fix: strip `.git` suffix from repository paths when using it in urls

Sebastian Thiel committed 5 years ago

Commit a3aaa3e1 parent 53ee1a72 files · +8 −3Browse files

Unified · Split

2 files

         self.inner.host.as_ref().map(|h| h == "github.com").unwrap_or(false)
     }
+    fn cleaned_path(&self) -> String {
+        let path = self.inner.path.to_str_lossy().into_owned();
+        path.strip_suffix(".git").map(ToOwned::to_owned).unwrap_or(path)
+    }
     pub fn github_https(&self) -> Option<String> {
         match &self.inner.host {
             Some(host) if host == "github.com" => match self.inner.scheme {
                 Scheme::Http | Scheme::Https | Scheme::Git => {
-                    format!("https://github.com{}", self.inner.path.to_str_lossy()).into()
+                    format!("https://github.com{}", self.cleaned_path()).into()
                 }
                 Scheme::Ssh => self
                     .inner
                     .user
                     .as_ref()
-                    .map(|user| format!("https://github.com{}/{}", user, self.inner.path.to_str_lossy())),
+                    .map(|user| format!("https://github.com{}/{}", user, self.cleaned_path())),
                 Scheme::Radicle | Scheme::File => None,
             },
             None | Some(_) => None,

@@ -53,7 +53,7 @@ fn conventional_write_empty_messages() -> Result { · 52 unmodified lines
53	for link_mode in &[	53	for link_mode in &[
54	changelog::write::Linkables::AsText,	54	changelog::write::Linkables::AsText,
55	changelog::write::Linkables::AsLinks {	55	changelog::write::Linkables::AsLinks {
56	repository_url: git_repository::Url::try_from(b"https://github.com/user/repo".as_bytes())?.into(),	56	repository_url: git_repository::Url::try_from(b"https://github.com/user/repo.git".as_bytes())?.into(),
57	},	57	},
58	] {	58	] {
59	let log = log.clone();	59	let log = log.clone();

Keyboard shortcuts