Skip to content

Commit 13a070f

Browse files
committed
adjust to changes in gix-worktree
1 parent af9ca15 commit 13a070f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: gix/src/config/cache/access.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ impl Cache {
176176
attributes: self.assemble_attribute_globals(
177177
git_dir,
178178
case,
179-
gix_worktree::cache::state::attributes::Source::AttributeListThenWorktree,
179+
gix_worktree::cache::state::attributes::Source::IdMappingThenWorktree,
180180
self.attributes,
181181
)?,
182182
fs: capabilities,

Diff for: gix/src/worktree/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ pub mod excludes {
151151
None,
152152
case,
153153
));
154-
let attribute_list = state.attribute_list_from_index(index, index.path_backing(), case);
154+
let attribute_list = state.id_mappings_from_index(index, index.path_backing(), case);
155155
Ok(gix_worktree::Cache::new(self.path, state, case, buf, attribute_list))
156156
}
157157
}

Diff for: src/plumbing/options/free.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,13 @@ pub mod pack {
287287

288288
#[derive(Debug, clap::Subcommand)]
289289
pub enum Subcommands {
290-
/// Display all entries of a multi-index: <oid> <pack-id> <pack-offset>
290+
/// Display all entries of a multi-index as: *oid* *pack-id* *pack-offset*
291291
Entries,
292292
/// Print general information about a multi-index file
293293
Info,
294294
/// Verify a multi-index quickly without inspecting objects themselves
295295
Verify,
296-
/// Create a multi-pack index from one or more pack index files, overwriting possibloy existing files.
296+
/// Create a multi-pack index from one or more pack index files, overwriting possibly existing files.
297297
Create {
298298
/// Paths to the pack index files to read (with .idx extension).
299299
///

0 commit comments

Comments
 (0)