Merging upstream version 1.75.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

11 files changed, 77 insertions, 36 deletions

diff --git a/vendor/gix-index/.cargo-checksum.json b/vendor/gix-index/.cargo-checksum.json
index 40c6b9e9e..7667e2043 100644
--- a/vendor/gix-index/.cargo-checksum.json
+++ b/vendor/gix-index/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"a41b5defb7051ee80bcd82a6398ffff375b0a82d3f64f8046379c49d0eefb422","Cargo.toml":"39629ab1d6629c39eec7e97b1b90b956957c5eec22fd4b06c7dce0be4334f743","LICENSE-APACHE":"cb4780590812826851ba250f90bed0ed19506ec98f6865a0e2e20bbf62391ff9","LICENSE-MIT":"49df47913ab2beafe8dc45607877ae64198bf0eee64aaad3e82ed9e4d27424e8","README.md":"5b2b4dc7ee56738b6049fb41ff03dd3d71fbdc1f0f72080f47c0d24f79c4b5cd","src/access/mod.rs":"bc18f80f6e0ac72e08e61779bb596afc8961ab5af89aa3bc63ff70ff45ef2652","src/access/sparse.rs":"06b49a6a4578be70814a85e376fda23d0a2465ca83d7a201f9f365b29710a50b","src/decode/entries.rs":"b3e7f09eb9532ae7dbbe51fc1924c94b8a0440b00e4259474c1032509354b480","src/decode/header.rs":"dc8b369949e811e7f6f7234f0b2f344645582079af4fd63f02d7f30c0495ba43","src/decode/mod.rs":"19e9b9cbe6aa7cc35ede8d9e7d7d2695b78c5880350480005f258740b3d56656","src/entry/flags.rs":"b32458d6567bc005c3da72552205788c5191b4fb0de80ebc8fccc86c934e2dc9","src/entry/mod.rs":"eb8f7627124a680ebff0797f888618964a5f80a5c819f56f5f4573b0da74cb4f","src/entry/mode.rs":"66564a179a5273f8101c1515573ac5e910ebc96f01cc06fee3d344f944d9fc7b","src/entry/stat.rs":"0b08093293be4cea17a9655add779b909e65129709c048a77cc04db610cacf75","src/entry/write.rs":"9b1aa309fff759bd5791c39fb348ceb5cc6ce935d7eddaf841b9bea7672aa1c8","src/extension/decode.rs":"b39f3dbde55511e348514a9960f1ec6c724b7f1c222a0d246b6155966ec29624","src/extension/end_of_index_entry/decode.rs":"cfd8f5c3d5657669448826292737460a1dad124f3162ea0323c2e7a7b3bc259a","src/extension/end_of_index_entry/mod.rs":"4f05ce9eecdd91af4ecec5aeb46d3cd90cb96b718b87ce72a5cb7577c5e2a697","src/extension/end_of_index_entry/write.rs":"2a95dc2b10c40b18d2da5bf3cce787b47c09b83efb1cf75a4b70a6258978f897","src/extension/fs_monitor.rs":"ef45ee058ece94470c1c8ac47a84b542f7cfab47bbe49862d0c92310946fcab0","src/extension/index_entry_offset_table.rs":"4f51387b087abbdeb96c87cf935602749bfe36f1d44779c44b24d719d2689de0","src/extension/iter.rs":"d3f3efd6fc542fcc5ec2631083b8ecd764c00838f5614ae4a9f8f6c5436b0009","src/extension/link.rs":"22bdaf6f25d869481cfa230c8b07d565b928ca8d977e28be7bee6a74131a5a25","src/extension/mod.rs":"358dcf44248ce3920af9ff3764e972e69ecddd9f12c34faeab1bec85b6c85996","src/extension/resolve_undo.rs":"37d29f82d8fc2926e9ad36796753e7c63c15ab96418577e50f2be78b4c539cf2","src/extension/sparse.rs":"d95d64d39b1007ad1039ab3584671c25b0069e28b2cddfcdc91b090ee4eea684","src/extension/tree/decode.rs":"fda161e6e83f14356fe737ff66bb6cf01f759e584ca271bceff028e4da43a0c7","src/extension/tree/mod.rs":"a7ae7ee2bbacacf3536051f479c4f8c0cab73fa2dd270ab50ec96bdb49fc88db","src/extension/tree/verify.rs":"7a39f730d9e79bb3a2f521514e9c635b3c8e3b4c3262f5bffe7e6612c8759bee","src/extension/tree/write.rs":"bb71478fff5773385109c2006ecd7e84808691d566e2be04d8b90c048c9895b6","src/extension/untracked_cache.rs":"14cb9fc4dd097e0faa497a6d27393a9055b0066e63bf9a2350ee02c5f7669f70","src/file/init.rs":"9906c7ba573de75f4823f61cdaceaf7de876f51891a398528dd424d7d3686d6c","src/file/mod.rs":"6737b994a21d519550d2930dab1d1de2e1cd42f0fc41c2fa10f6c37d24f14045","src/file/verify.rs":"57c5619a5a85cd708d3788d5727a7227777ea1b99643c9b95ac881a0442ffa0a","src/file/write.rs":"342c1902b1cf01b3e6ba89d868ba6f2df654f020919a20491ca6c164c709a1cd","src/init.rs":"66d623fe96deea6db9e40091c4caa75f8066c12f7a9283b523b34646d60fbdaa","src/lib.rs":"61bc554d273e75130905f0db63d01528c0f7671b50fdaf17483b905b857ea5d3","src/verify.rs":"207c4b9723fc70b2b9219f39c5992216a4e6cc440247c5a452d2787941c53b3b","src/write.rs":"60fb380ae27962d1f59f117ded6eab56758b04da2e98984635fc7292ed9a929a"},"package":"f54d63a9d13c13088f41f5a3accbec284e492ac8f4f707fcc307c139622e17b7"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"917727b1d72c19c14c8d922c5073e8d73287210d54ff4c6887dbeeee9102b4ef","Cargo.toml":"32874f8d79db9e10e2618a9acd2a8d8ca83f03c24d08397501057d452cdd1bc4","LICENSE-APACHE":"cb4780590812826851ba250f90bed0ed19506ec98f6865a0e2e20bbf62391ff9","LICENSE-MIT":"49df47913ab2beafe8dc45607877ae64198bf0eee64aaad3e82ed9e4d27424e8","README.md":"5b2b4dc7ee56738b6049fb41ff03dd3d71fbdc1f0f72080f47c0d24f79c4b5cd","src/access/mod.rs":"1060edabbbfdde70f82bdcb3a9ba5b25f32ac5d7a00309ee2aa5f8bfa80bc82c","src/access/sparse.rs":"06b49a6a4578be70814a85e376fda23d0a2465ca83d7a201f9f365b29710a50b","src/decode/entries.rs":"b3e7f09eb9532ae7dbbe51fc1924c94b8a0440b00e4259474c1032509354b480","src/decode/header.rs":"dc8b369949e811e7f6f7234f0b2f344645582079af4fd63f02d7f30c0495ba43","src/decode/mod.rs":"19e9b9cbe6aa7cc35ede8d9e7d7d2695b78c5880350480005f258740b3d56656","src/entry/flags.rs":"b32458d6567bc005c3da72552205788c5191b4fb0de80ebc8fccc86c934e2dc9","src/entry/mod.rs":"5f2af3e8b7234afc6e9ef09d9fac1bbcff2d0cd56d213070263c19eec3d3eb3a","src/entry/mode.rs":"66564a179a5273f8101c1515573ac5e910ebc96f01cc06fee3d344f944d9fc7b","src/entry/stat.rs":"fa00d668f6d231ce70ec31da602582449241776f161e36bfd4bbb0ab6f537191","src/entry/write.rs":"9b1aa309fff759bd5791c39fb348ceb5cc6ce935d7eddaf841b9bea7672aa1c8","src/extension/decode.rs":"b39f3dbde55511e348514a9960f1ec6c724b7f1c222a0d246b6155966ec29624","src/extension/end_of_index_entry/decode.rs":"cfd8f5c3d5657669448826292737460a1dad124f3162ea0323c2e7a7b3bc259a","src/extension/end_of_index_entry/mod.rs":"4f05ce9eecdd91af4ecec5aeb46d3cd90cb96b718b87ce72a5cb7577c5e2a697","src/extension/end_of_index_entry/write.rs":"2a95dc2b10c40b18d2da5bf3cce787b47c09b83efb1cf75a4b70a6258978f897","src/extension/fs_monitor.rs":"ef45ee058ece94470c1c8ac47a84b542f7cfab47bbe49862d0c92310946fcab0","src/extension/index_entry_offset_table.rs":"4f51387b087abbdeb96c87cf935602749bfe36f1d44779c44b24d719d2689de0","src/extension/iter.rs":"d3f3efd6fc542fcc5ec2631083b8ecd764c00838f5614ae4a9f8f6c5436b0009","src/extension/link.rs":"22bdaf6f25d869481cfa230c8b07d565b928ca8d977e28be7bee6a74131a5a25","src/extension/mod.rs":"358dcf44248ce3920af9ff3764e972e69ecddd9f12c34faeab1bec85b6c85996","src/extension/resolve_undo.rs":"37d29f82d8fc2926e9ad36796753e7c63c15ab96418577e50f2be78b4c539cf2","src/extension/sparse.rs":"d95d64d39b1007ad1039ab3584671c25b0069e28b2cddfcdc91b090ee4eea684","src/extension/tree/decode.rs":"fda161e6e83f14356fe737ff66bb6cf01f759e584ca271bceff028e4da43a0c7","src/extension/tree/mod.rs":"a7ae7ee2bbacacf3536051f479c4f8c0cab73fa2dd270ab50ec96bdb49fc88db","src/extension/tree/verify.rs":"7a39f730d9e79bb3a2f521514e9c635b3c8e3b4c3262f5bffe7e6612c8759bee","src/extension/tree/write.rs":"bb71478fff5773385109c2006ecd7e84808691d566e2be04d8b90c048c9895b6","src/extension/untracked_cache.rs":"14cb9fc4dd097e0faa497a6d27393a9055b0066e63bf9a2350ee02c5f7669f70","src/file/init.rs":"1d28b7c07664a9fda2720de0c7e12063e044f3bcaf3310dcd48f38a56f074258","src/file/mod.rs":"6737b994a21d519550d2930dab1d1de2e1cd42f0fc41c2fa10f6c37d24f14045","src/file/verify.rs":"8dfec40e5cc0c48f0da93fe22fcb069b87a97150061a0615e235c82aae17dffb","src/file/write.rs":"68279fd02dfd390e6f8a84cc3f96c9afb98b887a0222509391f97dbb0b0fddf8","src/init.rs":"565d94c145cc3ab928c8bbae07ee7b097e8f2375f7943643e81cb75f3e9c4ff2","src/lib.rs":"ec62a77dbafe0d03008ecb4ca2f3dd5116ed6215ab3fe9f587340b2260dc120f","src/verify.rs":"207c4b9723fc70b2b9219f39c5992216a4e6cc440247c5a452d2787941c53b3b","src/write.rs":"60fb380ae27962d1f59f117ded6eab56758b04da2e98984635fc7292ed9a929a"},"package":"c83a4fcc121b2f2e109088f677f89f85e7a8ebf39e8e6659c0ae54d4283b1650"}
\ No newline at end of file
diff --git a/vendor/gix-index/CHANGELOG.md b/vendor/gix-index/CHANGELOG.md
index bc5a540a8..90d256244 100644
--- a/vendor/gix-index/CHANGELOG.md
+++ b/vendor/gix-index/CHANGELOG.md
@@ -5,6 +5,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.26.0 (2023-10-12)
+
+### Bug Fixes (BREAKING)
+
+ - <csr-id-a1794b537c036e5469f7c2808d460bffcc6eeb5a/> use `PathStorageRef` in place of `&PathStorage`
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 8 commits contributed to the release over the course of 13 calendar days.
+ - 17 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Prepare changelogs prior to release ([`1347a54`](https://github.com/Byron/gitoxide/commit/1347a54f84599d8f0aa935d6e64b16c2298d25cf))
+    - Merge branch 'fix-input' ([`a899f74`](https://github.com/Byron/gitoxide/commit/a899f74a20c3e9a40f456387d71b48ca9187af17))
+    - Assure a prefixed entries range is never empty. ([`357ba13`](https://github.com/Byron/gitoxide/commit/357ba137fe63e4b3f92732d665870085be888223))
+    - Fix docs ([`995bc84`](https://github.com/Byron/gitoxide/commit/995bc840664cbd4aeb7f95592e3125dee63bdcd4))
+    - Merge branch 'reset' ([`b842691`](https://github.com/Byron/gitoxide/commit/b8426919a491dc3a7df01ee3f258fc0d8a3a327c))
+    - Use `PathStorageRef` in place of `&PathStorage` ([`a1794b5`](https://github.com/Byron/gitoxide/commit/a1794b537c036e5469f7c2808d460bffcc6eeb5a))
+    - Add more traces to potentially longer-running operations ([`1568948`](https://github.com/Byron/gitoxide/commit/15689482351691079652d7b9b80b5aaecb7da863))
+    - Adapt to `gix-features` ([`9e7c3e1`](https://github.com/Byron/gitoxide/commit/9e7c3e12528833023bf37ada4e2e90989d848e99))
+</details>
+
 ## 0.25.0 (2023-09-24)
 
 ### New Features
@@ -21,7 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 4 commits contributed to the release over the course of 1 calendar day.
+ - 5 commits contributed to the release over the course of 1 calendar day.
  - 16 days passed between releases.
  - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
@@ -33,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
+    - Release gix-features v0.35.0, gix-actor v0.27.0, gix-object v0.37.0, gix-glob v0.13.0, gix-attributes v0.19.0, gix-filter v0.5.0, gix-fs v0.7.0, gix-commitgraph v0.21.0, gix-revwalk v0.8.0, gix-traverse v0.33.0, gix-worktree-stream v0.5.0, gix-archive v0.5.0, gix-tempfile v10.0.0, gix-lock v10.0.0, gix-ref v0.37.0, gix-config v0.30.0, gix-url v0.24.0, gix-credentials v0.20.0, gix-diff v0.36.0, gix-discover v0.25.0, gix-ignore v0.8.0, gix-index v0.25.0, gix-mailmap v0.19.0, gix-negotiate v0.8.0, gix-pack v0.43.0, gix-odb v0.53.0, gix-pathspec v0.3.0, gix-transport v0.37.0, gix-protocol v0.40.0, gix-revision v0.22.0, gix-refspec v0.18.0, gix-status v0.1.0, gix-submodule v0.4.0, gix-worktree v0.26.0, gix-worktree-state v0.3.0, gix v0.54.0, gitoxide-core v0.32.0, gitoxide v0.30.0, safety bump 37 crates ([`7891fb1`](https://github.com/Byron/gitoxide/commit/7891fb17348ec2f4c997665f9a25be36e2713da4))
     - Prepare changelogs prior to release ([`8a60d5b`](https://github.com/Byron/gitoxide/commit/8a60d5b80877c213c3b646d3061e8a33e0e433ec))
     - Merge branch 'reset' ([`54a8495`](https://github.com/Byron/gitoxide/commit/54a849545140f7f1c0c7564c418071c0a76a34e7))
     - Make time conversion more robust ([`fd034e0`](https://github.com/Byron/gitoxide/commit/fd034e03b5a05dcc7a01014ce6a97b7cf93086be))
diff --git a/vendor/gix-index/Cargo.toml b/vendor/gix-index/Cargo.toml
index 5adb14cf1..300c3cdb4 100644
--- a/vendor/gix-index/Cargo.toml
+++ b/vendor/gix-index/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.65"
 name = "gix-index"
-version = "0.25.0"
+version = "0.26.0"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 include = [
     "src/**/*",
@@ -62,26 +62,26 @@ version = "0.2.15"
 version = "^0.2.7"
 
 [dependencies.gix-features]
-version = "^0.35.0"
+version = "^0.36.0"
 features = [
     "rustsha1",
     "progress",
 ]
 
 [dependencies.gix-fs]
-version = "^0.7.0"
+version = "^0.8.0"
 
 [dependencies.gix-hash]
-version = "^0.13.0"
+version = "^0.13.1"
 
 [dependencies.gix-lock]
-version = "^10.0.0"
+version = "^11.0.0"
 
 [dependencies.gix-object]
-version = "^0.37.0"
+version = "^0.38.0"
 
 [dependencies.gix-traverse]
-version = "^0.33.0"
+version = "^0.34.0"
 
 [dependencies.itoa]
 version = "1.0.3"
diff --git a/vendor/gix-index/src/access/mod.rs b/vendor/gix-index/src/access/mod.rs
index 08cb23020..2a3e85f11 100644
--- a/vendor/gix-index/src/access/mod.rs
+++ b/vendor/gix-index/src/access/mod.rs
@@ -4,7 +4,7 @@ use std::ops::Range;
 use bstr::{BStr, ByteSlice, ByteVec};
 use filetime::FileTime;
 
-use crate::{entry, extension, Entry, PathStorage, State, Version};
+use crate::{entry, extension, Entry, PathStorage, PathStorageRef, State, Version};
 
 // TODO: integrate this somehow, somewhere, depending on later usage.
 #[allow(dead_code)]
@@ -41,7 +41,7 @@ impl State {
         &self.entries
     }
     /// Return our path backing, the place which keeps all paths one after another, with entries storing only the range to access them.
-    pub fn path_backing(&self) -> &PathStorage {
+    pub fn path_backing(&self) -> &PathStorageRef {
         &self.path_backing
     }
 
@@ -58,7 +58,7 @@ impl State {
     /// Return mutable entries along with their path, as obtained from `backing`.
     pub fn entries_mut_with_paths_in<'state, 'backing>(
         &'state mut self,
-        backing: &'backing PathStorage,
+        backing: &'backing PathStorageRef,
     ) -> impl Iterator<Item = (&'state mut Entry, &'backing BStr)> {
         self.entries.iter_mut().map(move |e| {
             let path = backing[e.path.clone()].as_bstr();
@@ -279,7 +279,7 @@ impl State {
     }
 
     /// Return a writable slice to entries and read-access to their path storage at the same time.
-    pub fn entries_mut_and_pathbacking(&mut self) -> (&mut [Entry], &PathStorage) {
+    pub fn entries_mut_and_pathbacking(&mut self) -> (&mut [Entry], &PathStorageRef) {
         (&mut self.entries, &self.path_backing)
     }
 
diff --git a/vendor/gix-index/src/entry/mod.rs b/vendor/gix-index/src/entry/mod.rs
index e680e08b0..2f257ef63 100644
--- a/vendor/gix-index/src/entry/mod.rs
+++ b/vendor/gix-index/src/entry/mod.rs
@@ -1,4 +1,8 @@
-/// The stage of an entry, one of 0 = base, 1 = ours, 2 = theirs
+/// The stage of an entry, one of…
+/// * 0 = no conflict,
+/// * 1 = base,
+/// * 2 = ours,
+/// * 3 = theirs
 pub type Stage = u32;
 
 ///
@@ -71,7 +75,7 @@ mod access {
             backing[self.path.clone()].as_bstr()
         }
 
-        /// Return an entry's stage.
+        /// Return an entry's stage. See [entry::Stage] for possible values.
         pub fn stage(&self) -> entry::Stage {
             self.flags.stage()
         }
diff --git a/vendor/gix-index/src/entry/stat.rs b/vendor/gix-index/src/entry/stat.rs
index 7bde71763..5e60f8540 100644
--- a/vendor/gix-index/src/entry/stat.rs
+++ b/vendor/gix-index/src/entry/stat.rs
@@ -92,21 +92,22 @@ impl Stat {
             size: fstat.len() as u32,
         };
         #[cfg(unix)]
-        use std::os::unix::fs::MetadataExt;
-        #[cfg(unix)]
-        let res = Stat {
-            mtime: mtime.try_into().unwrap_or_default(),
-            ctime: ctime.try_into().unwrap_or_default(),
-            // truncating to 32 bits is fine here because
-            // that's what the linux syscalls returns
-            // just rust upcasts to 64 bits for some reason?
-            // numbers this large are impractical anyway (that's a lot of hard-drives).
-            dev: fstat.dev() as u32,
-            ino: fstat.ino() as u32,
-            uid: fstat.uid(),
-            gid: fstat.gid(),
-            // truncation to 32 bits is on purpose (git does the same).
-            size: fstat.len() as u32,
+        let res = {
+            use std::os::unix::fs::MetadataExt;
+            Stat {
+                mtime: mtime.try_into().unwrap_or_default(),
+                ctime: ctime.try_into().unwrap_or_default(),
+                // truncating to 32 bits is fine here because
+                // that's what the linux syscalls returns
+                // just rust upcasts to 64 bits for some reason?
+                // numbers this large are impractical anyway (that's a lot of hard-drives).
+                dev: fstat.dev() as u32,
+                ino: fstat.ino() as u32,
+                uid: fstat.uid(),
+                gid: fstat.gid(),
+                // truncation to 32 bits is on purpose (git does the same).
+                size: fstat.len() as u32,
+            }
         };
 
         Ok(res)
diff --git a/vendor/gix-index/src/file/init.rs b/vendor/gix-index/src/file/init.rs
index 99f4be258..ed13bed6e 100644
--- a/vendor/gix-index/src/file/init.rs
+++ b/vendor/gix-index/src/file/init.rs
@@ -78,7 +78,7 @@ impl File {
                     let num_bytes_to_hash = meta.len() - object_hash.len_in_bytes() as u64;
                     let actual_hash = gix_features::hash::bytes(
                         &mut file,
-                        num_bytes_to_hash as usize,
+                        num_bytes_to_hash,
                         object_hash,
                         &mut gix_features::progress::Discard,
                         &Default::default(),
diff --git a/vendor/gix-index/src/file/verify.rs b/vendor/gix-index/src/file/verify.rs
index 3890acd95..1c0dc7539 100644
--- a/vendor/gix-index/src/file/verify.rs
+++ b/vendor/gix-index/src/file/verify.rs
@@ -27,7 +27,7 @@ impl File {
             let should_interrupt = AtomicBool::new(false);
             let actual = gix_features::hash::bytes_of_file(
                 &self.path,
-                num_bytes_to_hash as usize,
+                num_bytes_to_hash,
                 checksum.kind(),
                 &mut gix_features::progress::Discard,
                 &should_interrupt,
diff --git a/vendor/gix-index/src/file/write.rs b/vendor/gix-index/src/file/write.rs
index 47a4cde96..0623f6c59 100644
--- a/vendor/gix-index/src/file/write.rs
+++ b/vendor/gix-index/src/file/write.rs
@@ -22,6 +22,7 @@ impl File {
         mut out: impl std::io::Write,
         options: write::Options,
     ) -> std::io::Result<(Version, gix_hash::ObjectId)> {
+        let _span = gix_features::trace::detail!("gix_index::File::write_to()", skip_hash = options.skip_hash);
         let (version, hash) = if options.skip_hash {
             let out: &mut dyn std::io::Write = &mut out;
             let version = self.state.write_to(out, options)?;
@@ -40,6 +41,7 @@ impl File {
     ///
     /// Note that the hash produced will be stored which is why we need to be mutable.
     pub fn write(&mut self, options: write::Options) -> Result<(), Error> {
+        let _span = gix_features::trace::detail!("gix_index::File::write()", path = ?self.path);
         let mut lock = std::io::BufWriter::with_capacity(
             64 * 1024,
             gix_lock::File::acquire_to_update_resource(&self.path, gix_lock::acquire::Fail::Immediately, None)?,
diff --git a/vendor/gix-index/src/init.rs b/vendor/gix-index/src/init.rs
index 9fe0b8e27..ec09af538 100644
--- a/vendor/gix-index/src/init.rs
+++ b/vendor/gix-index/src/init.rs
@@ -31,7 +31,7 @@ mod from_tree {
                 fs_monitor: None,
             }
         }
-        /// Create an index [`State`][crate::State] by traversing `tree` recursively, accessing sub-trees
+        /// Create an index [`State`] by traversing `tree` recursively, accessing sub-trees
         /// with `find`.
         ///
         /// **No extension data is currently produced**.
diff --git a/vendor/gix-index/src/lib.rs b/vendor/gix-index/src/lib.rs
index 1fb1f6800..55b332a82 100644
--- a/vendor/gix-index/src/lib.rs
+++ b/vendor/gix-index/src/lib.rs
@@ -121,9 +121,10 @@ mod impls {
                     f,
                     "{} {}{:?} {} {}",
                     match entry.flags.stage() {
-                        0 => "BASE   ",
-                        1 => "OURS   ",
-                        2 => "THEIRS ",
+                        0 => "       ",
+                        1 => "BASE   ",
+                        2 => "OURS   ",
+                        3 => "THEIRS ",
                         _ => "UNKNOWN",
                     },
                     if entry.flags.is_empty() {