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
77 .transpose()?;77 .transpose()?;
78 git_index::File::at(78 git_index::File::at(
79 self.index_path(),79 self.index_path(),
80 self.object_hash(),
80 git_index::decode::Options {81 git_index::decode::Options {
81 object_hash: self.object_hash(),
82 thread_limit,82 thread_limit,
83 min_extension_block_in_bytes_for_threading: 0,83 min_extension_block_in_bytes_for_threading: 0,
84 },84 },
gitoxide-core/src/index/mod.rs+1−5
@@ -12,11 +12,7 @@ pub use entries::entries; · 11 unmodified lines
12pub mod information;12pub mod information;
13 13
14fn parse_file(index_path: impl AsRef<Path>, object_hash: git::hash::Kind) -> anyhow::Result<git::index::File> {14fn parse_file(index_path: impl AsRef<Path>, object_hash: git::hash::Kind) -> anyhow::Result<git::index::File> {
15 git::index::File::at(15 git::index::File::at(index_path.as_ref(), object_hash, Default::default()).map_err(Into::into)
16 index_path.as_ref(),
17 git::index::decode::Options::default_from_object_hash(object_hash),
18 )
19 .map_err(Into::into)
20}16}
21 17
22pub mod checkout_exclusive {18pub mod checkout_exclusive {