adapt to changes in git-repository

GitoxideLabs · Nov 29, 2022 · c4f68bf · c4f68bf
1 parent becbd8d
commit c4f68bf
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/cargo-smart-release/src/context.rs b/cargo-smart-release/src/context.rs
@@ -26,7 +26,7 @@ impl Context {
     ) -> anyhow::Result<Self> {
         let meta = cargo_metadata::MetadataCommand::new().exec()?;
         let root = meta.workspace_root.clone();
-        let repo = git::discover(&root)?.apply_environment();
+        let repo = git::discover(&root)?;
         let crates_index = crate::crates_index::Index::new_cargo_default()?;
         let history = (force_history_segmentation
             || matches!(bump, BumpSpec::Auto)

diff --git a/gitoxide-core/src/hours/mod.rs b/gitoxide-core/src/hours/mod.rs
@@ -53,7 +53,7 @@ where
     W: io::Write,
     P: Progress,
 {
-    let repo = git::discover(working_dir)?.apply_environment();
+    let repo = git::discover(working_dir)?;
     let commit_id = repo.rev_parse_single(rev_spec)?.detach();
     let mut string_heap = BTreeSet::<&'static [u8]>::new();
     let needs_stats = file_stats || line_stats;

diff --git a/gitoxide-core/src/index/checkout.rs b/gitoxide-core/src/index/checkout.rs
@@ -26,9 +26,7 @@ pub fn checkout_exclusive(
         thread_limit,
     }: index::checkout_exclusive::Options,
 ) -> anyhow::Result<()> {
-    let repo = repo
-        .map(|dir| git_repository::discover(dir).map(|r| r.apply_environment()))
-        .transpose()?;
+    let repo = repo.map(git_repository::discover).transpose()?;
 
     let dest_directory = dest_directory.as_ref();
     if dest_directory.exists() {

diff --git a/src/plumbing/main.rs b/src/plumbing/main.rs
@@ -89,8 +89,7 @@ pub fn main() -> Result<()> {
             mapping.full.modify(to_match_settings);
             mapping.reduced.modify(to_match_settings);
             let mut repo = git::ThreadSafeRepository::discover_opts(repository, Default::default(), mapping)
-                .map(git::Repository::from)
-                .map(|r| r.apply_environment())?;
+                .map(git::Repository::from)?;
             if !config.is_empty() {
                 repo.config_snapshot_mut()
                     .append_config(config.iter(), git::config::Source::Cli)