Skip to content

Update gix to 0.72.1, and adapt to its breaking changes. #6699

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

Merged
merged 3 commits into from
Jun 6, 2025
Merged

Conversation

ilyagr
Copy link
Contributor

@ilyagr ilyagr commented Jun 6, 2025

(See commit descriptions)

Cc: GitoxideLabs/gitoxide#1935,
GitoxideLabs/gitoxide#2038

Checklist

If applicable:

  • (n/a) I have updated CHANGELOG.md
  • (n/a) I have updated the documentation (README.md, docs/, demos/)
  • (n/a) I have updated the config schema (cli/src/config-schema.json)
  • (n/a) I have added/updated tests to cover my changes

@ilyagr ilyagr force-pushed the ig/gixupdate branch 2 times, most recently from 754b053 to 4636de8 Compare June 6, 2025 02:14
@ilyagr ilyagr marked this pull request as ready for review June 6, 2025 02:15
@ilyagr ilyagr requested a review from a team as a code owner June 6, 2025 02:15
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

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

Thanks.

ilyagr added 3 commits June 6, 2025 11:32
This is in preparation for updating `gix` in the following commit,
which changes the `gix::actor::SignatureRef` API significantly
and in a way that would be awkward for this function to support.
Update `gix` to 0.72.1, and adapt to its breaking changes.

1. The signature of `gix::reference::iter::Platform::prefixed` changed
   in a way that seems to confuse Rust compiler (and does confuse me).

2. `git_object::Tree::EntryMode` API changed; `entry.mode()` now has a
   `value()` method.

3. Most significantly, the meaning and API of `gix::actor::SignatureRef`
   changed.

## Details about `gix::actor::SignatureRef`

The API for `gix::actor::Signature` and `gix::actor::SignatureRef`
changedd. The latter now contains an unparsed string time field, while
the former still contains a parsed time.  So, the conversions between
`gix::actor::SignatureRef` and either `gix::actor::Signature` or jj's
`Signature` types can now fail.

We use the epoch for the time if the timestamp is unreadable, like gix
did before.

Cc: GitoxideLabs/gitoxide#1935,
GitoxideLabs/gitoxide#2038
@ilyagr ilyagr added this pull request to the merge queue Jun 6, 2025
Merged via the queue into main with commit 93c46a9 Jun 6, 2025
26 checks passed
@ilyagr ilyagr deleted the ig/gixupdate branch June 6, 2025 18:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants