Unified · Split
| @@ -1834,7 +1834,6 @@ dependencies = [ · 1833 unmodified lines | ||
| 1834 | 1834 | "futures-io", |
| 1835 | 1835 | "futures-lite", |
| 1836 | 1836 | "git-commitgraph", |
| 1837 | − "git-config", | |
| 1838 | 1837 | "git-features", |
| 1839 | 1838 | "git-pack", |
| 1840 | 1839 | "git-repository", |
| @@ -40,7 +40,6 @@ git-repository = { version = "^0.24.0", path = "../git-repository", default-feat · 39 unmodified lines | ||
| 40 | 40 | git-pack-for-configuration-only = { package = "git-pack", version = "^0.22.0", path = "../git-pack", default-features = false, features = ["pack-cache-lru-dynamic", "pack-cache-lru-static"] } |
| 41 | 41 | git-transport-configuration-only = { package = "git-transport", version = "^0.20.0", path = "../git-transport", default-features = false } |
| 42 | 42 | git-commitgraph = { version = "^0.8.2", path = "../git-commitgraph" } |
| 43 | −git-config = { version = "^0.7.1", path = "../git-config" } | |
| 44 | 43 | git-features = { version = "^0.22.4", path = "../git-features" } |
| 45 | 44 | serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] } |
| 46 | 45 | anyhow = "1.0.42" |
| @@ -4,7 +4,6 @@ use std::{ · 3 unmodified lines | ||
| 4 | 4 | }; |
| 5 | 5 | |
| 6 | 6 | use git::{objs::bstr::ByteSlice, progress, Progress}; |
| 7 | −use git_config::File; | |
| 8 | 7 | use git_repository as git; |
| 9 | 8 | |
| 10 | 9 | #[derive(Copy, Clone, Eq, PartialEq)] |
| @@ -101,9 +100,9 @@ where · 90 unmodified lines | ||
| 101 | 100 | |
| 102 | 101 | fn find_origin_remote(repo: &Path) -> anyhow::Result<Option<git_url::Url>> { |
| 103 | 102 | let non_bare = repo.join(".git").join("config"); |
| 104 | − let local = git_config::Source::Local; | |
| 105 | − let config = File::from_path_no_includes(non_bare.as_path(), local) | |
| 106 | − .or_else(|_| File::from_path_no_includes(repo.join("config").as_path(), local))?; | |
| 103 | + let local = git::config::Source::Local; | |
| 104 | + let config = git::config::File::from_path_no_includes(non_bare.as_path(), local) | |
| 105 | + .or_else(|_| git::config::File::from_path_no_includes(repo.join("config").as_path(), local))?; | |
| 107 | 106 | Ok(config |
| 108 | 107 | .string("remote", Some("origin"), "url") |
| 109 | 108 | .map(|url| git_url::Url::from_bytes(url.as_ref())) |