v0.28.1

jj-vcs/jjv0.28.1Apr 5, 2025by arxanas

AI Summary

This is a maintenance release focused on security and bug fixes. It addresses a critical SHA-1 collision detection issue and resolves problems with multi-sided merge tools and build processes.

Key Highlights

Fixed SHA-1 collision attacks not being detected (GHSA-794x-2rpg-rfgr).
Resolved potential build issues for packagers.
Fixed a bug with `:ours` and `:theirs` merge tools involving conflicted trees with more than two sides.

Full Release Notes

> [!NOTE]  
> Also see the [v0.28.0 release notes](https://github.com/jj-vcs/jj/releases/tag/v0.28.0).

### About

jj is a Git-compatible version control system that is both simple and powerful. See the [installation instructions](https://jj-vcs.github.io/jj/v0.28.0/install-and-setup/) to get started.

### Security fixes

* Fixed SHA-1 collision attacks not being detected.
  ([GHSA-794x-2rpg-rfgr](https://github.com/jj-vcs/jj/security/advisories/GHSA-794x-2rpg-rfgr))

### Fixed bugs

* Resolved some potential build issues for packagers.
  [#6232](https://github.com/jj-vcs/jj/pull/6232)

* Fix a bug with `:ours` and `:theirs` merge tools involving conflicted trees
  with more than two sides. [#6227](https://github.com/jj-vcs/jj/pull/6227)

### Contributors

Thanks to the people who made this release happen!

* Emily (@emilazy)
* Ilya Grigoriev (@ilyagr)
* Nicole Patricia Mazzuca (@strega-nil)
* Scott Taylor (@scott2000)
* Yuya Nishihara (@yuja)