Skip to content

Commit 1a111ab

Browse files
chore(deps): update rust crate gix to 0.62.0 [security]
1 parent 9f8adff commit 1a111ab

File tree

3 files changed

+40
-38
lines changed

3 files changed

+40
-38
lines changed

Cargo.lock

Lines changed: 37 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ filetime = "0.2.23"
4646
flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
4747
git2 = "0.18.3"
4848
git2-curl = "0.19.0"
49-
gix = { version = "0.61.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] }
49+
gix = { version = "0.62.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] }
5050
glob = "0.3.1"
5151
handlebars = { version = "5.1.2", features = ["dir_source"] }
5252
hex = "0.4.3"

src/cargo/sources/path.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use cargo_util::paths;
1515
use filetime::FileTime;
1616
use gix::bstr::{BString, ByteVec};
1717
use gix::dir::entry::Status;
18+
use gix::index::entry::Stage;
1819
use ignore::gitignore::GitignoreBuilder;
1920
use tracing::{debug, trace, warn};
2021
use walkdir::WalkDir;
@@ -533,7 +534,7 @@ impl<'gctx> PathSource<'gctx> {
533534
.iter()
534535
.filter(|entry| {
535536
// probably not needed as conflicts prevent this to run, but let's be explicit.
536-
entry.stage() == 0
537+
entry.stage() == Stage::Unconflicted
537538
})
538539
.map(|entry| {
539540
(

0 commit comments

Comments
 (0)