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 #1476

Merged
merged 1 commit into from
Dec 7, 2024
Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Nov 25, 2024

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

Updates gix from 0.67.0 to 0.68.0

Release notes

Sourced from gix's releases.

gix v0.68.0

New Features

  • Add support for index application in merge results via merge::tree::Outcome::index_changed_after_applying_conflicts()

  • add Repository::merge_base_octopus()

  • add Repository::virtual_merge_base() and Repository::virtual_merge_base_with_graph().

  • add Repository::merge_commits() It's often more convenient to work with commits when merging, especially when merge-bases are dealt with automatically.

  • add objects::tree::Editor::detach() to get the underlying editor back. This can be useful to have more control over what gets written, or how.

  • add Repository::index_or_load_from_head_or_empty(). It's useful to get a reasonable index in any case, even on unborn repositories. It's for cases where the HEAD isn't setup at all, despite content being available, and to avoid unnecessary restrictions on what works.

  • add Object::peel_to_commit() to assure an object turns into a commit.

  • add Repository::merge_trees()

  • gix::Repository implements all traits for object reading and writing. That way it becomes usable when merging trees, which benefits from automatic checking of hashes before writing loose objects.

  • add tree() and commit() merge support, en par with merge-ORT as far as tests go. Note that this judgement of quality is based on a limited amount of partially complex test, but it's likely that in practice there will be deviations of sorts.

    Also, given the complexity of the implementation it is definitely under-tested, but with that it's mostly en par with Git, unfortunatly.

    On the bright side, some of the tests are very taxing and I'd hope this means something for real-world quality.

Bug Fixes

  • Repository::tree_merge_options() now comes with rewrite tracking. This is the way Git acts, as it's either configured, or defaults to the value coming from the diff.renames configuration.

  • respect core.bare=true in conjunction with the main worktree

  • propagate errors that are triggered when writing objects Previously it was assumed that writing objects could never fail unless there isn't enough memory to do so. However, it turns out that some last-minute validation can always be triggered and prevent an object to be written.

    Now that error is propagated instead.

  • assure submodules are skipped everywhere This also adds Repository::head_tree() for convenience.

New Features (BREAKING)

  • Repository::merge_trees() now takes portable version of Options.
  • Repository::merge_trees() now has a fully-wrapped outcome.

... (truncated)

Commits
  • 4000197 Release gix-glob v0.17.1, gix-command v0.3.11, gix-filter v0.15.0, gix-chunk ...
  • 9d627bb prepare changelogs once more
  • 4145d2a fix gix-path version (which fails publishing due to the patch-level mismatch)
  • 8ce4912 Release gix-date v0.9.2, gix-actor v0.33.1, gix-hash v0.15.1, gix-features v0...
  • bc9d994 prepare changelogs prior to release
  • 54ea266 Merge pull request #1700 from GitoxideLabs/reduce-memory
  • 664e28c try to reduce memory consumption by avoiding over-capacity of possibly large ...
  • 0b7abfb Merge pull request #1661 from GitoxideLabs/merge
  • 71b0cea feat: Add support for index application in merge results via `merge::tree::...
  • 3ee8b62 feat: provide a way to record and apply index changes.
  • Additional commits viewable in compare view

Updates gix-features from 0.39.0 to 0.39.1

Changelog

Sourced from gix-features's changelog.

Changelog

All notable changes to this project will be documented in this file.

The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.

Commits
  • 8ce4912 Release gix-date v0.9.2, gix-actor v0.33.1, gix-hash v0.15.1, gix-features v0...
  • bc9d994 prepare changelogs prior to release
  • 54ea266 Merge pull request #1700 from GitoxideLabs/reduce-memory
  • 664e28c try to reduce memory consumption by avoiding over-capacity of possibly large ...
  • 0b7abfb Merge pull request #1661 from GitoxideLabs/merge
  • 71b0cea feat: Add support for index application in merge results via `merge::tree::...
  • 3ee8b62 feat: provide a way to record and apply index changes.
  • 5db2d2d feat: add tree_with_rewrites::Change(Ref)::source_mode_and_id|mode_and_id()
  • b57be71 fix: Repository::tree_merge_options() now comes with rewrite tracking.
  • 0a5993f feat: add gix merge commit --debug
  • 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

@dependabot dependabot bot added dependencies Pull requests that update a dependency file rust Pull requests that update Rust code labels Nov 25, 2024
@dependabot dependabot bot force-pushed the dependabot/cargo/gix-3d49bf09c1 branch from e265e23 to a49da34 Compare December 2, 2024 21:50
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.67.0 to 0.68.0
- [Release notes](https://github.com/GitoxideLabs/gitoxide/releases)
- [Changelog](https://github.com/GitoxideLabs/gitoxide/blob/main/CHANGELOG.md)
- [Commits](GitoxideLabs/gitoxide@gix-v0.67.0...gix-v0.68.0)

Updates `gix-features` from 0.39.0 to 0.39.1
- [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.0...gix-features-v0.39.1)

---
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-patch
  dependency-group: gix
...

Signed-off-by: dependabot[bot] <[email protected]>
@o2sh o2sh merged commit 39bd88b into main Dec 7, 2024
10 checks passed
@o2sh o2sh deleted the dependabot/cargo/gix-3d49bf09c1 branch December 7, 2024 10:45
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.

1 participant