Skip to content

Allow releasing from a branch other than master - #5819

Merged
stefanhaller merged 4 commits into
v0.63.1from
release-from-branch-other-than-master
Jul 15, 2026
Merged

Allow releasing from a branch other than master#5819
stefanhaller merged 4 commits into
v0.63.1from
release-from-branch-other-than-master

Conversation

@stefanhaller

Copy link
Copy Markdown
Collaborator

This is useful for cutting a patch release for the previous version when master already contains work that shouldn't be released yet.

Scheduled runs are unaffected: with no input provided, the ref is empty and the checkout falls back to the default branch.

The Get Latest Tag step used to pick the most recently created tag in
the entire repo, regardless of whether it is reachable from the commit
being released. In preparation for supporting releases from branches
other than master, use the nearest tag that is an ancestor of the
checked-out commit instead. This way, a patch release cut from an
older release branch bumps that branch's own latest tag even when
master already carries a newer release, and the "changes since last
release" check compares against the release that actually precedes
this one in history.
When creating a patch release from a branch called `v0.63.1`, the new
tag would get the same name and pushing it would fail with `error: src
refspec v0.63.1 matches more than one`.
This is useful for cutting a patch release for the previous version
when master already contains work that shouldn't be released yet; for
example, v0.63.1 had to be tagged and released by hand from a v0.63.1
branch off the v0.63.0 tag because the workflow could only release
master.

Scheduled runs are unaffected: with no input provided, the ref is
empty and the checkout falls back to the default branch.
I keep getting slightly confused as to which is which, so make this
extra clear.

While at it, change the default to minor, this is the option that is
more often used now that we don't have regular scheduled releases any
more.
@stefanhaller stefanhaller added the maintenance For refactorings, CI changes, tests, version bumping, etc label Jul 15, 2026
@stefanhaller
stefanhaller merged commit aafe610 into v0.63.1 Jul 15, 2026
13 checks passed
@stefanhaller
stefanhaller deleted the release-from-branch-other-than-master branch July 15, 2026 11:32
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Jul 17, 2026
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit) | patch | `v0.63.0` → `v0.63.1` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary>

### [`v0.63.1`](https://github.com/jesseduffield/lazygit/releases/tag/v0.63.1)

[Compare Source](jesseduffield/lazygit@v0.63.0...v0.63.1)

<!-- Release notes generated using configuration in .github/release.yml at v0.63.1 -->

Fixes for a few regressions introduced in the v0.63.0 release.

#### What's Changed

##### Fixes 🔧

- Improve index.lock retry mechanism by [@&#8203;stefanhaller](https://github.com/stefanhaller) in [#&#8203;5788](jesseduffield/lazygit#5788)
- Fix userEvents panic by [@&#8203;stefanhaller](https://github.com/stefanhaller) in [#&#8203;5793](jesseduffield/lazygit#5793)
- Fix a deadlock on Windows when switching between longer diffs by [@&#8203;stefanhaller](https://github.com/stefanhaller) in [#&#8203;5815](jesseduffield/lazygit#5815)

##### Maintenance ⚙️

- Allow releasing from a branch other than master by [@&#8203;stefanhaller](https://github.com/stefanhaller) in [#&#8203;5819](jesseduffield/lazygit#5819)

**Full Changelog**: <jesseduffield/lazygit@v0.63.0...v0.63.1>

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - At any time (no schedule defined)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4yNjMuNiIsInVwZGF0ZWRJblZlciI6IjQzLjI2My42IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiLCJhdXRvbWF0aW9uOmJvdC1hdXRob3JlZCIsImRlcGVuZGVuY3ktdHlwZTo6cGF0Y2giXX0=-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

maintenance For refactorings, CI changes, tests, version bumping, etc

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant