History

remove `git-config` dependency

Sebastian Thiel committed 4 years ago

Commit cf63d871 parent cbc9ba93 files · +3 −6Browse files

Unified · Split

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