chore(deps): update rust crate gix to 0.62.0 [security]

rust-lang · Apr 15, 2024 · 1a111ab · 1a111ab
1 parent 9f8adff
commit 1a111ab
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,7 +46,7 @@ filetime = "0.2.23"
 flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
 git2 = "0.18.3"
 git2-curl = "0.19.0"
-gix = { version = "0.61.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] }
+gix = { version = "0.62.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] }
 glob = "0.3.1"
 handlebars = { version = "5.1.2", features = ["dir_source"] }
 hex = "0.4.3"

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
@@ -15,6 +15,7 @@ use cargo_util::paths;
 use filetime::FileTime;
 use gix::bstr::{BString, ByteVec};
 use gix::dir::entry::Status;
+use gix::index::entry::Stage;
 use ignore::gitignore::GitignoreBuilder;
 use tracing::{debug, trace, warn};
 use walkdir::WalkDir;
@@ -533,7 +534,7 @@ impl<'gctx> PathSource<'gctx> {
                     .iter()
                     .filter(|entry| {
                         // probably not needed as conflicts prevent this to run, but let's be explicit.
-                        entry.stage() == 0
+                        entry.stage() == Stage::Unconflicted
                     })
                     .map(|entry| {
                         (