Skip to content

fix(deps): update gix - autoclosed #1339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ferrlabs-renovate wants to merge 1 commit into from
Closed

fix(deps): update gix - autoclosed #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 87 additions & 29 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ clap = { version = "4", features = ["derive", "env"], optional = true }
clap_complete = { version = "4", optional = true }
colored = { version = "3", optional = true }
gix = { version = "0.89", default-features = false, features = ["sha1", "max-performance-safe", "revision"], optional = true }
gix-traverse = { version = "0.63", optional = true }
gix-diff = { version = "0.69", default-features = false, features = ["sha1"], optional = true }
gix-traverse = { version = "0.64", optional = true }

@ferrfleet-interne ferrfleet-interne Bot Oct 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking: gix 0.89 still depends on gix-traverse 0.63 (see the lockfile), so the crate now builds two copies of it. src/git/tags.rs:240 passes gix_traverse::commit::simple::CommitTimeOrder (now 0.64) into gix::revision::walk::Sorting::ByCommitTime (a re-export from 0.63). Those are distinct types, so this should fail with E0308. gix-traverse and gix-diff need to move in lockstep with gix. Pin them back, and group them with gix in the Renovate config so they only bump together. If gix 0.89 re-exports CommitTimeOrder (I haven't checked), importing it from gix::revision::walk would let you drop the direct gix-traverse dep entirely.

Suggested change
gix-traverse = { version = "0.64", optional = true }
gix-traverse = { version = "0.63", optional = true }

gix-diff = { version = "0.70", default-features = false, features = ["sha1"], optional = true }
ureq = { version = "3", features = ["json"], optional = true }
# YAML source configs for `ferrflow migrate` (cli-only). Maintained serde_yaml fork.
serde_norway = { version = "0.9", optional = true }
Expand Down
Loading