diff --git a/.changes/unreleased/Added-20240907-161636.yaml b/.changes/unreleased/Added-20240907-161636.yaml deleted file mode 100644 index 30ea7e0d..00000000 --- a/.changes/unreleased/Added-20240907-161636.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: Windows support. -time: 2024-09-07T16:16:36.18073-07:00 diff --git a/.changes/unreleased/Changed-20240904-054549.yaml b/.changes/unreleased/Changed-20240904-054549.yaml deleted file mode 100644 index 6e2f789b..00000000 --- a/.changes/unreleased/Changed-20240904-054549.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Changed -body: >- - submit: If a CR for a branch is closed or merged, - and the branch is submitted again, - git-spice will now create a new CR for that branch - instead of failing to update the existing CR. -time: 2024-09-04T05:45:49.967536-07:00 diff --git a/.changes/unreleased/Changed-20240913-185002.yaml b/.changes/unreleased/Changed-20240913-185002.yaml deleted file mode 100644 index c1d869b6..00000000 --- a/.changes/unreleased/Changed-20240913-185002.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'repo sync: Reduce the number of network requests made to check status of submitted branches.' -time: 2024-09-13T18:50:02.036293-07:00 diff --git a/.changes/unreleased/Changed-20240914-175829.yaml b/.changes/unreleased/Changed-20240914-175829.yaml deleted file mode 100644 index 218a84a5..00000000 --- a/.changes/unreleased/Changed-20240914-175829.yaml +++ /dev/null @@ -1,9 +0,0 @@ -kind: Changed -body: >- - repo sync: - Gracefully degrade for unsupported Git hosting services - by looking for merged branches locally - instead of attempting to make API requests and failing. - This only works for merge commits and fast-forwards, - but it makes it easier to use git-spice with non-GitHub remotes. -time: 2024-09-14T17:58:29.581188-07:00 diff --git a/.changes/unreleased/Fixed-20240903-182150.yaml b/.changes/unreleased/Fixed-20240903-182150.yaml deleted file mode 100644 index 4f2d422c..00000000 --- a/.changes/unreleased/Fixed-20240903-182150.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'branch submit: Present template list in consistent order.' -time: 2024-09-03T18:21:50.565691-07:00 diff --git a/.changes/unreleased/Fixed-20240912-045448.yaml b/.changes/unreleased/Fixed-20240912-045448.yaml deleted file mode 100644 index 2e4baf59..00000000 --- a/.changes/unreleased/Fixed-20240912-045448.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'branch create: Fix bug where aborting a commit would leave the repository in a detached HEAD state.' -time: 2024-09-12T04:54:48.790051-07:00 diff --git a/.changes/unreleased/Fixed-20240912-051752.yaml b/.changes/unreleased/Fixed-20240912-051752.yaml deleted file mode 100644 index 2df70f4d..00000000 --- a/.changes/unreleased/Fixed-20240912-051752.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'repo sync: Don''t warn about missing remote tracking branch if it was already deleted by a ''git fetch --prune'' or similar operation.' -time: 2024-09-12T05:17:52.115595-07:00 diff --git a/.changes/unreleased/Fixed-20240914-120358.yaml b/.changes/unreleased/Fixed-20240914-120358.yaml deleted file mode 100644 index f0575866..00000000 --- a/.changes/unreleased/Fixed-20240914-120358.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'repo sync: Delete the correct tracking branch for renamed branches.' -time: 2024-09-14T12:03:58.254791-07:00 diff --git a/.changes/v0.6.0.md b/.changes/v0.6.0.md new file mode 100644 index 00000000..88b6a97c --- /dev/null +++ b/.changes/v0.6.0.md @@ -0,0 +1,12 @@ +## v0.6.0 - 2024-09-17 +### Added +- Windows support. +### Changed +- submit: If a CR for a branch is closed or merged, and the branch is submitted again, git-spice will now create a new CR for that branch instead of failing to update the existing CR. +- repo sync: Reduce the number of network requests made to check status of submitted branches. +- repo sync: Gracefully degrade for unsupported Git hosting services by looking for merged branches locally instead of attempting to make API requests and failing. This only works for merge commits and fast-forwards, but it makes it easier to use git-spice with non-GitHub remotes. +### Fixed +- branch submit: Present template list in consistent order. +- branch create: Fix bug where aborting a commit would leave the repository in a detached HEAD state. +- repo sync: Don't warn about missing remote tracking branch if it was already deleted by a 'git fetch --prune' or similar operation. +- repo sync: Delete the correct tracking branch for renamed branches. diff --git a/CHANGELOG.md b/CHANGELOG.md index aa7221f0..916ba2ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and is generated by [Changie](https://github.com/miniscruff/changie). +## v0.6.0 - 2024-09-17 +### Added +- Windows support. +### Changed +- submit: If a CR for a branch is closed or merged, and the branch is submitted again, git-spice will now create a new CR for that branch instead of failing to update the existing CR. +- repo sync: Reduce the number of network requests made to check status of submitted branches. +- repo sync: Gracefully degrade for unsupported Git hosting services by looking for merged branches locally instead of attempting to make API requests and failing. This only works for merge commits and fast-forwards, but it makes it easier to use git-spice with non-GitHub remotes. +### Fixed +- branch submit: Present template list in consistent order. +- branch create: Fix bug where aborting a commit would leave the repository in a detached HEAD state. +- repo sync: Don't warn about missing remote tracking branch if it was already deleted by a 'git fetch --prune' or similar operation. +- repo sync: Delete the correct tracking branch for renamed branches. + ## v0.5.2 - 2024-08-30 ### Fixed - submit: Fix outdated PR template being used when trunk is behind its remote ref. diff --git a/doc/src/recipes.md b/doc/src/recipes.md index b77d3527..333bea86 100644 --- a/doc/src/recipes.md +++ b/doc/src/recipes.md @@ -44,7 +44,7 @@ and then work on them, you can use the following to adjust the workflow: ### Working with non-GitHub remotes - + If you're using a Git hosting service that is not GitHub (e.g. GitLab, Bitbucket, etc.), diff --git a/doc/src/start/install.md b/doc/src/start/install.md index 9eeb9c90..f1e9d009 100644 --- a/doc/src/start/install.md +++ b/doc/src/start/install.md @@ -14,7 +14,7 @@ or built from source. - **Operating system**: Linux and macOS are fully supported. - Windows support was added in . + Windows support was added in . - **Architecture**: x86_64 and aarch64 architectures are supported.