History

adjust to changes in `git-index`

Sebastian Thiel committed 4 years ago

Commit fa6bcde1 parent 908163a2 files · +2 −6Browse files

Unified · Split

2 files
  1. git-repository/src/repository/worktree.rs +1 −1
  2. gitoxide-core/src/index/mod.rs +1 −5
git-repository/src/repository/worktree.rs+1−1
@@ -77,8 +77,8 @@ impl crate::Repository { · 76 unmodified lines
7777 .transpose()?;
7878 git_index::File::at(
7979 self.index_path(),
80+ self.object_hash(),
8081 git_index::decode::Options {
81− object_hash: self.object_hash(),
8282 thread_limit,
8383 min_extension_block_in_bytes_for_threading: 0,
8484 },
gitoxide-core/src/index/mod.rs+1−5
@@ -12,11 +12,7 @@ pub use entries::entries; · 11 unmodified lines
1212 pub mod information;
1313
1414 fn parse_file(index_path: impl AsRef<Path>, object_hash: git::hash::Kind) -> anyhow::Result<git::index::File> {
15− git::index::File::at(
16− index_path.as_ref(),
17− git::index::decode::Options::default_from_object_hash(object_hash),
18− )
19− .map_err(Into::into)
15+ git::index::File::at(index_path.as_ref(), object_hash, Default::default()).map_err(Into::into)
2016 }
2117
2218 pub mod checkout_exclusive {