Skip to content
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.

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

Bump the gix group with 2 updates #1512

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jan 20, 2025

Bumps the gix group with 2 updates: gix and gix-features.

Updates gix from 0.69.1 to 0.70.0

Release notes

Sourced from gix's releases.

gix v0.70.0

Chore

  • bump rust-version to 1.70 That way clippy will allow to use the fantastic Option::is_some_and() and friends.

New Features

  • add Repository::upstream_branch_and_remote_name_for_tracking_branch() It's a way to learn about the Remote and upstream branch which would match the given local tracking branch.
  • more often check for interrupts in status iterator
  • add tree::Editor|editor::Cursor::get() to see if an entry is loaded at path. This can be useful to get a feeling for how far the tree was already made available, even though it won't reveal if an entry was edited.
  • Repository::is_dirty() now also checks for tree/index changes. This copmpletes the is_dirty() implementation.
  • Repository::tree_index_status() to see the changes between a tree and an index. It also respects status.rename and status.renameLimit to configure rename tracking.
  • add Tree::depthfirst() with a delegate. This allows a depth-first traversal with a delegate.
  • Add blame plumbing crate to the top-level. For now, it doesn't come with a simplified gix API though.

Bug Fixes

  • Repository::status() detects files added to the index in an unborn repository. Previously it wouldn't show them.

  • Respository::status() iterator won't fail in unborn directories.

  • worktrees of submodules now know their correct worktree Previously they would use a very incorrect worktree which would cause the status to be calculated very wrongly.

  • status-iterator won't swallow legitimate modification during 'racy-git'. When a modification is marked as being racy, then previously the iterator would have kept the whole modification even though it should just have tracked the single change.

    This made the legitimate modification disappear.

  • write_blob_stream() does not need Seek trait anymore. Internally, it has to turn it into a buffer so it's not needed anymore. It also counteracts the idea of using a stream with arbitrarily big files.

  • Submodule::status() now konws about tree-index changes as well. This completes the status implementation.

  • remove unused fetch-error variants Note that it's a breaking change, but it's on top of a previous breaking change so folks would already have to update explicitly.

Other

  • make really clear that Repository::worktrees() lists linked worktrees.

... (truncated)

Commits
  • dea106a Release gix-utils v0.1.14, gix-actor v0.33.2, gix-hash v0.16.0, gix-trace v0....
  • 7570daa don't specify version numbers in dev-dependencies
  • 1f6390c update all changelogs prior to release
  • 1e37e95 Merge pull request #1777 from EliahKagan/run-ci/arm
  • d5dc5bf Merge pull request #1776 from EliahKagan/fuzz-next
  • 90e08f1 Merge pull request #1774 from EliahKagan/complex-graph-no-baseline-next
  • c7f5013 Let either test-32bit cancel the other on failure
  • c3d4cff Remove the test-32bit-cross job
  • fbc27b5 Install 64-bit libstdc++ in both 32-bit containers
  • cbe3793 Use the ARM runner for some 32-bit tests
  • Additional commits viewable in compare view

Updates gix-features from 0.39.1 to 0.40.0

Release notes

Sourced from gix-features's releases.

gix-features v0.40.0

Chore

  • bump rust-version to 1.70 That way clippy will allow to use the fantastic Option::is_some_and() and friends.

Commit Statistics

  • 4 commits contributed to the release over the course of 55 calendar days.
  • 55 days passed between releases.
  • 1 commit was understood as conventional.
  • 0 issues like '(#ID)' were seen in commit messages

Commit Details

  • Uncategorized
    • Update all changelogs prior to release (1f6390c)
    • Merge pull request #1762 from GitoxideLabs/fix-1759 (7ec21bb)
    • Bump rust-version to 1.70 (17835bc)
    • Merge pull request #1701 from GitoxideLabs/release (e8b3b41)
Changelog

Sourced from gix-features's changelog.

0.40.0 (2024-12-22)

New Features

  • add first 'debug' version of gix log It's primarily meant to better understand gix blame.
  • add --tree-favor to gix merge tree|commit. With it one can decide which side to favor in case of irreconcilable tree-conflicts.

Bug Fixes

  • gix merge file now uses THEIRS instead of OURS where needed

Commit Statistics

  • 7 commits contributed to the release over the course of 27 calendar days.
  • 28 days passed between releases.
  • 3 commits were understood as conventional.
  • 1 unique issue was worked on: #1703

Commit Details

  • #1703
    • gix merge file now uses THEIRS instead of OURS where needed (0727b56)
  • Uncategorized
    • Merge pull request #1643 from cruessler/add-gix-log (29cb775)
    • Add first 'debug' version of gix log (c7e04e9)
    • Merge pull request #1705 from GitoxideLabs/merge (520c832)
    • Adapt to changes in gix-diff (960773e)
    • Add --tree-favor to gix merge tree|commit. (471e046)
    • Merge pull request #1704 from GitoxideLabs/fix-1703 (e8ce25f)

0.39.0 (2024-11-24)

New Features

  • add gix merge commit --debug This yields additional debugging information with details about detected conflicts.
  • add gix merge commits
  • add gix merge tree to merge trees similarly to git merge-tree.

Commit Statistics

... (truncated)

Commits
  • dea106a Release gix-utils v0.1.14, gix-actor v0.33.2, gix-hash v0.16.0, gix-trace v0....
  • 7570daa don't specify version numbers in dev-dependencies
  • 1f6390c update all changelogs prior to release
  • 1e37e95 Merge pull request #1777 from EliahKagan/run-ci/arm
  • d5dc5bf Merge pull request #1776 from EliahKagan/fuzz-next
  • 90e08f1 Merge pull request #1774 from EliahKagan/complex-graph-no-baseline-next
  • c7f5013 Let either test-32bit cancel the other on failure
  • c3d4cff Remove the test-32bit-cross job
  • fbc27b5 Install 64-bit libstdc++ in both 32-bit containers
  • cbe3793 Use the ARM runner for some 32-bit tests
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

Bumps the gix group with 2 updates: [gix](https://github.com/GitoxideLabs/gitoxide) and [gix-features](https://github.com/GitoxideLabs/gitoxide).


Updates `gix` from 0.69.1 to 0.70.0
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases)
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md)
- [Commits](GitoxideLabs/gitoxide@gix-v0.69.1...gix-v0.70.0)

Updates `gix-features` from 0.39.1 to 0.40.0
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases)
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md)
- [Commits](GitoxideLabs/gitoxide@gix-features-v0.39.1...gix-features-v0.40.0)

---
updated-dependencies:
- dependency-name: gix
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gix
- dependency-name: gix-features
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: gix
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file rust Pull requests that update Rust code labels Jan 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file rust Pull requests that update Rust code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0 participants