mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

release: 0.28.1

Browse source
This commit is contained in:
Waleed Khan 2025-04-04 14:28:40 -05:00
parent bedfb1ff51
commit 3aac8d21e6
3 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
CHANGELOG.md
View file

@ -8,13 +8,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### 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))
### Release highlights
### Breaking changes
### Deprecations
@ -23,6 +16,31 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
### Fixed bugs
## [0.28.1] - 2025-04-04
### 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)
## [0.28.0] - 2025-04-02
### Release highlights

10
Cargo.lock generated
View file

@ -1021,7 +1021,7 @@ dependencies = [
[[package]]
name = "gen-protos"
version = "0.28.0"
version = "0.28.1"
dependencies = [
"prost-build",
]
@ -2288,7 +2288,7 @@ dependencies = [
[[package]]
name = "jj-cli"
version = "0.28.0"
version = "0.28.1"
dependencies = [
"assert_cmd",
"assert_matches",
@ -2347,7 +2347,7 @@ dependencies = [
[[package]]
name = "jj-lib"
version = "0.28.0"
version = "0.28.1"
dependencies = [
"assert_matches",
"async-trait",
@ -2406,7 +2406,7 @@ dependencies = [
[[package]]
name = "jj-lib-proc-macros"
version = "0.28.0"
version = "0.28.1"
dependencies = [
"proc-macro2",
"quote",
@ -3940,7 +3940,7 @@ dependencies = [
[[package]]
name = "testutils"
version = "0.28.0"
version = "0.28.1"
dependencies = [
"async-trait",
"bstr",

6
Cargo.toml
View file

@ -5,7 +5,7 @@ resolver = "3"
members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
[workspace.package]
version = "0.28.0"
version = "0.28.1"
license = "Apache-2.0"
rust-version = "1.84" # NOTE: remember to update CI, contributing.md, changelog.md, and install-and-setup.md
edition = "2021"
@ -127,8 +127,8 @@ winreg = "0.52"
# put all inter-workspace libraries, i.e. those that use 'path = ...' here in
# their own (alphabetically sorted) block
jj-lib = { path = "lib", version = "0.28.0", default-features = false }
jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.28.0" }
jj-lib = { path = "lib", version = "0.28.1", default-features = false }
jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.28.1" }
testutils = { path = "lib/testutils" }
[workspace.lints.clippy]