From 2c1781917a2d17879d7efb025692574118b30e12 Mon Sep 17 00:00:00 2001 From: ECG Bot Date: Mon, 7 Oct 2024 09:49:00 +0000 Subject: [PATCH] build(deps): update git-town/git-town to v16.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This MR contains the following updates: | Package | Update | Change | |---|---|---| | [git-town/git-town](https://github.com/git-town/git-town) | minor | `v16.2.1` -> `v16.4.0` | 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
git-town/git-town (git-town/git-town) ### [`v16.4.0`](https://github.com/git-town/git-town/releases/tag/v16.4.0) [Compare Source](https://github.com/git-town/git-town/compare/v16.3.0...v16.4.0) Git Town 16.4 improves the usability in busy monorepos as well as the stability and resilience of Git Town in more environments. Many thanks to [@​FirelightFlagboy](https://github.com/FirelightFlagboy), [@​JamieMcKernanKaizen](https://github.com/JamieMcKernanKaizen), [@​alexw10](https://github.com/alexw10), [@​blaggacao](https://github.com/blaggacao), [@​charlierudolph](https://github.com/charlierudolph), [@​ericcao52](https://github.com/ericcao52), [@​ianjsikes](https://github.com/ianjsikes), [@​kevgo](https://github.com/kevgo), [@​ruudk](https://github.com/ruudk), [@​sheldonhull](https://github.com/sheldonhull), [@​shiv19](https://github.com/shiv19), [@​stephenwade](https://github.com/stephenwade), [@​tranhl](https://github.com/tranhl), [@​waldyrious](https://github.com/waldyrious) for improving Git Town through 39 shipped MRs and 13 resolved issues! ##### New Features - Git Town's `append`, `hack`, `prepend`, and `propose` commands now have a `--detached` flag that prevents them from pulling in additional changes from the main branch. This together with the existing `--detached` flag for `git town sync` allows controlling exactly when changes from the main branch get synced into your branch hierarchy ([#​4095](https://github.com/git-town/git-town/issues/4059)). - New config settings [contribution-regex](https://www.git-town.com/preferences/contribution-regex) and [observed-regex](https://www.git-town.com/preferences/observed-regex) allow marking branches created by external services like Renovate or Dependabot appropriately ([#​3985](https://github.com/git-town/git-town/issues/3985)). - Git Town is now much more resilient against unexpected Git failures, for example when another Git process is running concurrently, because most Git Town operations are now fully reentrant ([#​4082](https://github.com/git-town/git-town/pull/4082)). - `git town sync` now syncs branches whose ancestors aren't available locally better: It pulls the tracking branches of all non-local ancestors until it finds a local ancestor ([#​3769](https://github.com/git-town/git-town/issues/3769)). ##### Bug Fixes - `git town hack` no longer panics if the main branch isn't available locally ([#​3703](https://github.com/git-town/git-town/issues/3703)). - `git town hack` no longer panics when the Git repo has a detached HEAD ([#​3694](https://github.com/git-town/git-town/issues/3694)). - Git Town now loads all applicable settings from the config file ([#​4072](https://github.com/git-town/git-town/issues/4072)). ### [`v16.3.0`](https://github.com/git-town/git-town/releases/tag/v16.3.0) [Compare Source](https://github.com/git-town/git-town/compare/v16.2.1...v16.3.0) Git Town 16.3 is packed with some long-requested features we've been working towards for years! Big shoutout to [@​LogvinovLeon](https://github.com/LogvinovLeon), [@​alexw10](https://github.com/alexw10), [@​charlierudolph](https://github.com/charlierudolph), [@​cjol](https://github.com/cjol), [@​ericcao52](https://github.com/ericcao52), [@​kevgo](https://github.com/kevgo), [@​mw00120](https://github.com/mw00120), [@​ruudk](https://github.com/ruudk), [@​stephenwade](https://github.com/stephenwade), [@​tranhl](https://github.com/tranhl), [@​waldyrious](https://github.com/waldyrious), [@​zodman](https://github.com/zodman) for your insightful contributions, feedback, and ideas. Git Town is a much better product thanks to you and the 52 shipped MRs and 6 resolved issues in this release! ##### New Features - Full integration of proposals ([#​2745](https://github.com/git-town/git-town/issues/2745)): - Git Town now updates all affected pull requests when you rename, prepend, or remove a branch or change its parent. - If the parent of a branch is unknown but there's an open MR, Git Town will now grab the MR’s base branch as the parent. - `git town undo` now also reverts any changes made to pull requests ([#​4049](https://github.com/git-town/git-town/issues/4049)). - Full integration with the Bitbucket Cloud API ([#​973](https://github.com/git-town/git-town/issues/973)) and the gitea API ([#​4044](https://github.com/git-town/git-town/pull/4044)). - `git town rename-branch` now maintains the Git configuration and reflog for renamed branches ([#​4023](https://github.com/git-town/git-town/issues/4023)). - Git Town now logs all API interactions in the CLI, showing details like MR numbers and branch names it retrieves from the APIs. This makes it easier to see where information and possible slowness come from ([#​4020](https://github.com/git-town/git-town/pull/4020), [#​4026](https://github.com/git-town/git-town/pull/4026)).
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). --- chezmoi/dot_config/aquaproj-aqua/aqua.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chezmoi/dot_config/aquaproj-aqua/aqua.yaml b/chezmoi/dot_config/aquaproj-aqua/aqua.yaml index e5652804..c87ed51a 100644 --- a/chezmoi/dot_config/aquaproj-aqua/aqua.yaml +++ b/chezmoi/dot_config/aquaproj-aqua/aqua.yaml @@ -103,7 +103,7 @@ packages: - name: getsops/sops@v3.9.0 description: Simple and flexible tool for managing secrets link: https://github.com/getsops/sops -- name: git-town/git-town@v16.2.1 +- name: git-town/git-town@v16.4.0 description: Git workflow automation to keep branches in sync and reduce merge conflicts link: https://github.com/git-town/git-town - name: mr-karan/doggo@v1.0.4