Skip to content

Commit 3a18044

Browse files
committed
upgrade gix to the latest release 0.69.
The main benefit is that it won't facilitate hangs due to attempts to read from untrackable directory entries, like names pipes or sockets. Related to GitoxideLabs/gitoxide#1629
1 parent 652623b commit 3a18044

File tree

4 files changed

+66
-41
lines changed

4 files changed

+66
-41
lines changed

Cargo.lock

+61-38
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ filetime = "0.2.23"
4949
flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] }
5050
git2 = "0.19.0"
5151
git2-curl = "0.20.0"
52-
gix = { version = "0.68.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
52+
gix = { version = "0.69.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
5353
glob = "0.3.1"
5454
handlebars = { version = "6.0.0", features = ["dir_source"] }
5555
hex = "0.4.3"

src/cargo/sources/git/oxide.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ pub fn cargo_config_to_gitoxide_overrides(gctx: &GlobalContext) -> CargoResult<V
352352
}
353353

354354
/// Reinitializes a given Git repository. This is useful when a Git repository
355-
/// seems corrupted and we want to start over.
355+
/// seems corrupted, and we want to start over.
356356
pub fn reinitialize(git_dir: &Path) -> CargoResult<()> {
357357
fn init(path: &Path, bare: bool) -> CargoResult<()> {
358358
let mut opts = git2::RepositoryInitOptions::new();

src/cargo/sources/git/utils.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,9 @@ pub fn fetch(
10571057
fn has_shallow_lock_file(err: &crate::sources::git::fetch::Error) -> bool {
10581058
matches!(
10591059
err,
1060-
gix::env::collate::fetch::Error::Fetch(gix::remote::fetch::Error::LockShallowFile(_))
1060+
gix::env::collate::fetch::Error::Fetch(gix::remote::fetch::Error::Fetch(
1061+
gix::protocol::fetch::Error::LockShallowFile(_)
1062+
))
10611063
)
10621064
}
10631065

0 commit comments

Comments
 (0)