adjust to changes in gix-worktree

GitoxideLabs · Apr 24, 2023 · 13a070f · 13a070f
1 parent af9ca15
commit 13a070f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/gix/src/config/cache/access.rs b/gix/src/config/cache/access.rs
@@ -176,7 +176,7 @@ impl Cache {
             attributes: self.assemble_attribute_globals(
                 git_dir,
                 case,
-                gix_worktree::cache::state::attributes::Source::AttributeListThenWorktree,
+                gix_worktree::cache::state::attributes::Source::IdMappingThenWorktree,
                 self.attributes,
             )?,
             fs: capabilities,

diff --git a/gix/src/worktree/mod.rs b/gix/src/worktree/mod.rs
@@ -151,7 +151,7 @@ pub mod excludes {
                 None,
                 case,
             ));
-            let attribute_list = state.attribute_list_from_index(index, index.path_backing(), case);
+            let attribute_list = state.id_mappings_from_index(index, index.path_backing(), case);
             Ok(gix_worktree::Cache::new(self.path, state, case, buf, attribute_list))
         }
     }

diff --git a/src/plumbing/options/free.rs b/src/plumbing/options/free.rs
@@ -287,13 +287,13 @@ pub mod pack {
 
         #[derive(Debug, clap::Subcommand)]
         pub enum Subcommands {
-            /// Display all entries of a multi-index: <oid> <pack-id> <pack-offset>
+            /// Display all entries of a multi-index as: *oid* *pack-id* *pack-offset*
             Entries,
             /// Print general information about a multi-index file
             Info,
             /// Verify a multi-index quickly without inspecting objects themselves
             Verify,
-            /// Create a multi-pack index from one or more pack index files, overwriting possibloy existing files.
+            /// Create a multi-pack index from one or more pack index files, overwriting possibly existing files.
             Create {
                 /// Paths to the pack index files to read (with .idx extension).
                 ///
-Original file line number
+Diff line change
@@ Expand Up / @@ -151,7 +151,7 @@ pub mod excludes { @@
                     None,
                     case,
                 ));
-                let attribute_list = state.attribute_list_from_index(index, index.path_backing(), case);
+                let attribute_list = state.id_mappings_from_index(index, index.path_backing(), case);
                 Ok(gix_worktree::Cache::new(self.path, state, case, buf, attribute_list))
             }
         }
@@ Expand Down @@