-
-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Squash merge #3566
Add Squash merge #3566
Conversation
0824c4a
to
49b760e
Compare
Hello, I finished the feature, and it seems to work well, I will add tests in futures days, but I would like your feedback already if you feel it's needed. The only problem is to generate the cheatsheet, they seem to be empty for the squash, but I don't find where the generate takes them from. It's my first PR, hope it's good |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello 👋🏻 I left a couple of comments on your PR to discuss while you write the tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@noahfraiture - The ShowErrorInPanel function just changes how lazygit displays an error when the user tries to run a disabled action. The DisabledReason field must be nil to make an action available, so you can conditionally assign your structure to it when the required conditions for that command are met.
That said, I'd suggest updating GetDisabledReason to disable the menu in the case of merging the checked-out branch, instead of disabling the individual menu options. This approach is similar to how we handle rebase operations. Here is an example of what I would do: c36bbb1.
Also, I think it would be better to clean up the history of this branch before proceeding to merge it.
Thank you for your feedback. I applied your advices and made better tests. I also cleaned the commit if it's ok for you like this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice work, @noahfraiture! 👍🏻 I left two small suggestions (sorry, I noticed them only now), but the PR looks good. After addressing these last comments, I'll approve your PR so that one of the maintainers can take a look themselves.
This is good suggestion, I should have made them in the first place. Done and tested |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @noahfraiture, looks good to me 💪🏻 I would have suggested you to fix up the previous commits instead of adding a new one, but let's see what the maintainers think. Thanks for contributing!
@stefanhaller @jesseduffield this PR looks good to me - feel free to look at this when you have space for it 🙏🏻
Hello, is there something more that I can do for this PR ? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good, left some feedback.
The main thing is wording: We need to use squash merge
and not squash branch
or squash files
because the former is less confusing, and you may be squash merging something other than a branch (e.g. a tag).
I also prefer @stefanhaller 's original wording on the menu items i.e. 'Squash merge and leave uncommitted' and 'Squash merge and commit'.
Also, what currently happens if you choose to squash merge and commit, but there are merge conflicts? I suspect after conflicts are resolved, lazygit won't attempt to then create the merge commit. It's easier when git itself knows it's trying to merge something, so lazygit can prompt to continue to the merge, but does this also happen with squash merge?
No, it doesn't. This is my main gripe with the custom command that I'm currently using for this; after resolving conflicts I have to create the commit myself (typing the subject manually). This is annoying. It would be awesome if the status bar said "merging" in this case, and pressing To solve this, we'd have to keep track of this state ourselves somewhere in Model, and treat it as a fake working copy state. This sounds doable, but I'd suggest not to do this as part of this PR. The reason is that I'm currently working on refactoring the working copy state logic (in order to add support for cherry-pick and revert states), and this would conflict heavily with that work. |
89475cc
to
c959a1d
Compare
Thank you for your feedback, I added your suggestions and adapt the remaining mention of squash to fit the new wording. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a few more things
Done but a modification changed the translation file that already had "Squash" I adapt for every language to "SquashMerge" but I don't know if it's what's wanted |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
one more thing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry another thing: let's revert the changes to non-english i18n files. We're going to have software for doing this with AI very soon so no need to do it ourselves here (especially given we're not very good translators)
3b7be9c
to
cfbcb65
Compare
I've pushed some changes: I've replaced the merge confirmation popup with a menu which includes the option to squash merge: ![]() This has a few benefits:
What do people think? @stefanhaller I'm keen to get your thoughts on this |
Yes, this makes a lot of sense. So much that I'm actually surprised nobody has come up with the idea before, it seems so obvious in hindsight. Will test and review later today. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awesome, I like this.
I pushed one fixup with just very minor tweaks (7dc061d), and a bigger one (482e967) that makes the commit message configurable (I really like to use [SQUASHED] branch-name
myself, so that my squash merges stand out more in the log).
This second one also removes the CreateSquashMergeCommit
function that we no longer need now. The difference to before is that for people who have git.commit.signOff
set to true, they now get a sign-off added to their squash merge commits, which makes sense I guess (although we don't do it for regular merges).
Two more things inline below.
@@ -636,6 +637,16 @@ func (self *BranchesController) rebase(branch *models.Branch) error { | |||
return self.c.Helpers().MergeAndRebase.RebaseOntoRef(branch.Name) | |||
} | |||
|
|||
func (self *BranchesController) notRebasingOntoSelf(branch *models.Branch) *types.DisabledReason { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks unused.
pkg/i18n/translations/ja.json
Outdated
@@ -10,7 +10,6 @@ | |||
"MainTitle": "メイン", | |||
"StagingTitle": "メインパネル (Staging)", | |||
"MergingTitle": "メインパネル (Merging)", | |||
"MergeConfirmTitle": "マージ", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's going on here, did you edit these manually? I don't think we should do that, it's error-prone and unnecessary. The source of truth for these files should be crowdin (once we have it), until then we should simply leave these untouched.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed: I edited them manually. If crowdin is going to be the new source of truth for these translation files, I'm happy to leave them alone.
I've just set up a crowdin account and sent you an invite. I've also applied for the open-source licence so that it's free
pkg/i18n/english.go
Outdated
@@ -1271,7 +1280,9 @@ func EnglishTranslationSet() *TranslationSet { | |||
InteractiveRebaseTooltip: "Begin an interactive rebase with a break at the start, so you can update the TODO commits before continuing.", | |||
RebaseOntoBaseBranchTooltip: "Rebase the checked out branch onto its base branch (i.e. the closest main branch).", | |||
MustSelectTodoCommits: "When rebasing, this action only works on a selection of TODO commits.", | |||
ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?", | |||
SquashMergeUncommitted: "Squash merge '{{.selectedBranch}}' into the current working tree.", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"current working tree" reads a bit strange, as if there were several. I'd probably just drop the word "current".
I've addressed your comments @stefanhaller so I'm mergin Thanks for raising this PR @noahfraiture ! |
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [jesseduffield/lazygit](https://togithub.com/jesseduffield/lazygit) | minor | `v0.42.0` -> `v0.43.1` | --- ### Release Notes <details> <summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.43.1`](https://togithub.com/jesseduffield/lazygit/releases/tag/v0.43.1) [Compare Source](https://togithub.com/jesseduffield/lazygit/compare/v0.43.0...v0.43.1) <!-- Release notes generated using configuration in .github/release.yml at v0.43.1 --> #### What's Changed ##### Fixes 🔧 - Fix language auto detection by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3744](https://togithub.com/jesseduffield/lazygit/pull/3744) **Full Changelog**: jesseduffield/lazygit@v0.43.0...v0.43.1 ### [`v0.43.0`](https://togithub.com/jesseduffield/lazygit/releases/tag/v0.43.0) [Compare Source](https://togithub.com/jesseduffield/lazygit/compare/v0.42.0...v0.43.0) #### What's Changed Thanks to all contributors who helped make this release happen! There's a lot of first-time contributors on this release as well so kudos to you all. There's quite a few things in this release. I'm going to single out a couple that have changed my workflow. ##### Base branch stuff https://github.com/user-attachments/assets/9f50824a-6221-4ca0-9cf3-a4d45cc43262 ##### Easier rebase onto base branch *(Add command to rebase onto base branch by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3615](https://togithub.com/jesseduffield/lazygit/pull/3615))* When my feature branch gets out of date with the main branch, I like to rebase it onto the main branch. Up until now, that's required: - Navigating to the main branch - Pressing 'f' to fast-forward it onto its upstream branch - Pressing 'r' to rebase the checked-out branch onto the main branch That takes too long! Now you can just press 'r' followed by 'b' to rebase onto the base branch (which defaults to origin/main). ##### See the divergence count from the base branch *(Divergence from base branch display by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3613](https://togithub.com/jesseduffield/lazygit/pull/3613))* You can now also configure to see the divergence from a branch and its base branch with the following config: ```yml gui: showDivergenceFromBaseBranch: arrowAndNumber # or 'onlyArrow' ``` This shows the divergence count in blue, next to the yellow count of divergence from the upstream branch. This is admittedly noisy, so it's an opt-in feature. But I think the noise is worth it. If you set the config value to 'onlyArrow' it's a lot less noisy: <img width="891" alt="image" src="https://github.com/user-attachments/assets/470cb003-8fc6-4a72-aa04-6e228c49f381"> ##### See detailed divergence from base branch *(Add command to show divergence from base branch as a left-right log by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3614](https://togithub.com/jesseduffield/lazygit/pull/3614))* By pressing 'u' then 'b' on a branch you can see the divergence view for that branch compared to its base branch ##### Improved 'Find commit for fixup' feature *(Improve the "Find base commit for fixup" command by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3602](https://togithub.com/jesseduffield/lazygit/pull/3602))* 'Find commit for fixup' is not a very catchy name for this feature but I can't think of anything better at the moment. Nevertheless! The idea is that you often want to know for a given set of changes, which commit ought they be included in? Just press `ctrl+f` when in the files panel and lazygit will jump the cursor to the appropriate commit to fixup. With this release, the feature is smarter and more lenient so it's more likely to find you a match. If you haven't tried this out you should really give it a go! https://github.com/user-attachments/assets/220e4190-b631-40a5-b8dc-7d1a6116ab09 ##### Other Enhancements 🔥 - Add Squash merge by [@​noahfraiture](https://togithub.com/noahfraiture) in [https://github.com/jesseduffield/lazygit/pull/3566](https://togithub.com/jesseduffield/lazygit/pull/3566) - Now when you press `shift+m` you get the option to do a regular merge or a squash merge. If you already have muscle memory for regular merge; don't worry: it's the same sequence of keypresses. - Improve "Find base commit for fixup" command when there are changes for master commits by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3645](https://togithub.com/jesseduffield/lazygit/pull/3645) - Allow setting the similarity threshold for detecting renames by [@​isti115](https://togithub.com/isti115) in [https://github.com/jesseduffield/lazygit/pull/3025](https://togithub.com/jesseduffield/lazygit/pull/3025) - For this, press ')' and '(' to increase/decrease the similarity threshold. https://github.com/user-attachments/assets/a85825b8-9110-4090-ba89-ba8221cbc7a8 - Reduce memory consumption when loading large number of commits by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3687](https://togithub.com/jesseduffield/lazygit/pull/3687) - 2-6x less memory usage when dealing with lots of commits. HUGE improvement. - Focus on local commits view after moving code into new commit by [@​AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3577](https://togithub.com/jesseduffield/lazygit/pull/3577) - Add property outputTitle to CustomCommand by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3579](https://togithub.com/jesseduffield/lazygit/pull/3579) - Add user config `gui.expandedSidePanelWeight` by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3623](https://togithub.com/jesseduffield/lazygit/pull/3623) - You can now increase the height of the selected side panel when you've configured the accordion effect ```yml gui: expandFocusedSidePanel: true expandedSidePanelWeight: 3 ``` <img width="891" alt="image" src="https://github.com/user-attachments/assets/8a47bd1c-67b0-4d2f-a885-56e6a07ece12"> - Support range select for amending commit attributes by [@​AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3587](https://togithub.com/jesseduffield/lazygit/pull/3587) - This lets you select a range of commits and update the author / set the co-author on all of them at once. https://github.com/user-attachments/assets/2d3e15a9-4acc-4b81-b0e2-a34490ad77ad - Show "exec" todos in the list of rebase todos by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3654](https://togithub.com/jesseduffield/lazygit/pull/3654) - Search the model instead of the view in the commits panel by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3642](https://togithub.com/jesseduffield/lazygit/pull/3642) - Add prompt to the remote branch checkout menu by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3652](https://togithub.com/jesseduffield/lazygit/pull/3652) - Always show the "Discard unchanged changes" menu item by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3683](https://togithub.com/jesseduffield/lazygit/pull/3683) - Show current value in menus by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3628](https://togithub.com/jesseduffield/lazygit/pull/3628) - Add command to paste commit message from clipboard by [@​WaterLemons2k](https://togithub.com/WaterLemons2k) in [https://github.com/jesseduffield/lazygit/pull/3676](https://togithub.com/jesseduffield/lazygit/pull/3676) - Stagger popup panels by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3694](https://togithub.com/jesseduffield/lazygit/pull/3694) - Make commit author length configurable by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3688](https://togithub.com/jesseduffield/lazygit/pull/3688) (initial implementation by [@​anikiforov](https://togithub.com/anikiforov)) - Make opening git difftool more consistent by [@​part22](https://togithub.com/part22) in [https://github.com/jesseduffield/lazygit/pull/3691](https://togithub.com/jesseduffield/lazygit/pull/3691) - Update tracking behaviour for branches created from remote branches by [@​part22](https://togithub.com/part22) in [https://github.com/jesseduffield/lazygit/pull/3712](https://togithub.com/jesseduffield/lazygit/pull/3712) - Allow setting a default name when creating new branches by [@​elliotcubit](https://togithub.com/elliotcubit) in [https://github.com/jesseduffield/lazygit/pull/3487](https://togithub.com/jesseduffield/lazygit/pull/3487) - Add Token credential request handling by [@​gmlexx](https://togithub.com/gmlexx) in [https://github.com/jesseduffield/lazygit/pull/3647](https://togithub.com/jesseduffield/lazygit/pull/3647) - Switch between multiple log views by [@​mkock](https://togithub.com/mkock) in [https://github.com/jesseduffield/lazygit/pull/3354](https://togithub.com/jesseduffield/lazygit/pull/3354) - Faster startup by [@​jwhitley](https://togithub.com/jwhitley) in [https://github.com/jesseduffield/lazygit/pull/3284](https://togithub.com/jesseduffield/lazygit/pull/3284) - Extend icon coverage on remotes and file extensions by [@​hasecilu](https://togithub.com/hasecilu) in [https://github.com/jesseduffield/lazygit/pull/3484](https://togithub.com/jesseduffield/lazygit/pull/3484) - Add nerdfont icons for .bicep & .bicepparam files by [@​scottmckendry](https://togithub.com/scottmckendry) in [https://github.com/jesseduffield/lazygit/pull/3053](https://togithub.com/jesseduffield/lazygit/pull/3053) ##### Fixes 🔧 - Fix tooltip for fixup command by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3601](https://togithub.com/jesseduffield/lazygit/pull/3601) - Fix pushing to branch when upstream not stored locally by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3619](https://togithub.com/jesseduffield/lazygit/pull/3619) - ([#​3618](https://togithub.com/jesseduffield/lazygit/issues/3618)) Fix pushing a branch to remote with a different name causing error by [@​JordanllHarper](https://togithub.com/JordanllHarper) in [https://github.com/jesseduffield/lazygit/pull/3630](https://togithub.com/jesseduffield/lazygit/pull/3630) - Fix secondary window resize by [@​AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3637](https://togithub.com/jesseduffield/lazygit/pull/3637) - Fix truncation of branch names containing non-ASCII characters by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3685](https://togithub.com/jesseduffield/lazygit/pull/3685) - Fix duplicate keybinding suggestions in status bar after switching repos by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3660](https://togithub.com/jesseduffield/lazygit/pull/3660) - Fix PTY layout problems by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3658](https://togithub.com/jesseduffield/lazygit/pull/3658) - Fix custom patch operations for added files by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3684](https://togithub.com/jesseduffield/lazygit/pull/3684) - Improve render performance by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3686](https://togithub.com/jesseduffield/lazygit/pull/3686) - Fix wrong highlight in staging panel when entering file with only staged changes by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3667](https://togithub.com/jesseduffield/lazygit/pull/3667) - Always reapply filters on filtered views when model changes, even inactive ones by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3697](https://togithub.com/jesseduffield/lazygit/pull/3697) - Turn off the highlight of the suggestions panel when it loses focus by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3696](https://togithub.com/jesseduffield/lazygit/pull/3696) - Fix running lazygit with a language other than English on Windows by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3705](https://togithub.com/jesseduffield/lazygit/pull/3705) - Fix multi selection stage/discard not working for files with substrings by [@​brandondong](https://togithub.com/brandondong) in [https://github.com/jesseduffield/lazygit/pull/3599](https://togithub.com/jesseduffield/lazygit/pull/3599) - Only add commit prefix if branch name matches regex pattern by [@​phaze-ZA](https://togithub.com/phaze-ZA) in [https://github.com/jesseduffield/lazygit/pull/3703](https://togithub.com/jesseduffield/lazygit/pull/3703) ##### Maintenance ⚙️ - Add default lazygit config generation in Config.md from JSON schema by [@​karimkhaleel](https://togithub.com/karimkhaleel) in [https://github.com/jesseduffield/lazygit/pull/3565](https://togithub.com/jesseduffield/lazygit/pull/3565) - Remove hint about Config.md from PR template by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3578](https://togithub.com/jesseduffield/lazygit/pull/3578) - Add `copyloopvar` to enabled linters by [@​kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/3586](https://togithub.com/jesseduffield/lazygit/pull/3586) - Add `lint` to make target by [@​kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/3593](https://togithub.com/jesseduffield/lazygit/pull/3593) - Delete the TODO comment about enabling `goconst` in the future from `.golangci.yml` by [@​kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/3596](https://togithub.com/jesseduffield/lazygit/pull/3596) - Pin golangci version to 1.58 by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3611](https://togithub.com/jesseduffield/lazygit/pull/3611) - Improve branch and reflog loading when sorting branches by date by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3609](https://togithub.com/jesseduffield/lazygit/pull/3609) - Fix boolean config keys not appearing in the generated Config.md by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3622](https://togithub.com/jesseduffield/lazygit/pull/3622) - Make profiling easier by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3634](https://togithub.com/jesseduffield/lazygit/pull/3634) - Update `rebase_onto` demo test to match new the rebase menu title by [@​AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3636](https://togithub.com/jesseduffield/lazygit/pull/3636) - Include demos when running integration tests on CI by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3640](https://togithub.com/jesseduffield/lazygit/pull/3640) - Fix reporting of unexpected selections in integration tests by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3662](https://togithub.com/jesseduffield/lazygit/pull/3662) - Convert TranslationSets to json by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3649](https://togithub.com/jesseduffield/lazygit/pull/3649) - Fix go generate on windows by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3706](https://togithub.com/jesseduffield/lazygit/pull/3706) - Update translations from Crowdin by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3707](https://togithub.com/jesseduffield/lazygit/pull/3707) - Bump `actions/checkout`, `actions/setup-go`, `actions/cache/restore`, `actions/cache/save` by [@​kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/3594](https://togithub.com/jesseduffield/lazygit/pull/3594) - Check for fixup commits on CI by [@​jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3742](https://togithub.com/jesseduffield/lazygit/pull/3742) ##### Docs 📖 - Upgrade to Alpine Linux v3.19 by [@​fossdd](https://togithub.com/fossdd) in [https://github.com/jesseduffield/lazygit/pull/3541](https://togithub.com/jesseduffield/lazygit/pull/3541) - Add flox install by [@​bryanhonof](https://togithub.com/bryanhonof) in [https://github.com/jesseduffield/lazygit/pull/3656](https://togithub.com/jesseduffield/lazygit/pull/3656) #### New Contributors - [@​JordanllHarper](https://togithub.com/JordanllHarper) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3630](https://togithub.com/jesseduffield/lazygit/pull/3630) - [@​anikiforov](https://togithub.com/anikiforov) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3625](https://togithub.com/jesseduffield/lazygit/pull/3625) - [@​WaterLemons2k](https://togithub.com/WaterLemons2k) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3676](https://togithub.com/jesseduffield/lazygit/pull/3676) - [@​noahfraiture](https://togithub.com/noahfraiture) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3566](https://togithub.com/jesseduffield/lazygit/pull/3566) - [@​fossdd](https://togithub.com/fossdd) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3541](https://togithub.com/jesseduffield/lazygit/pull/3541) - [@​scottmckendry](https://togithub.com/scottmckendry) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3053](https://togithub.com/jesseduffield/lazygit/pull/3053) - [@​elliotcubit](https://togithub.com/elliotcubit) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3487](https://togithub.com/jesseduffield/lazygit/pull/3487) - [@​bryanhonof](https://togithub.com/bryanhonof) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3656](https://togithub.com/jesseduffield/lazygit/pull/3656) - [@​gmlexx](https://togithub.com/gmlexx) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3647](https://togithub.com/jesseduffield/lazygit/pull/3647) - [@​mkock](https://togithub.com/mkock) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3354](https://togithub.com/jesseduffield/lazygit/pull/3354) - [@​phaze-ZA](https://togithub.com/phaze-ZA) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3703](https://togithub.com/jesseduffield/lazygit/pull/3703) - [@​hasecilu](https://togithub.com/hasecilu) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3484](https://togithub.com/jesseduffield/lazygit/pull/3484) **Full Changelog**: jesseduffield/lazygit@v0.42.0...v0.43.0 #### Shameless Plug I (Jesse) quit my day job and co-founded Subble, a startup that helps your company manage its SaaS subscriptions (discovery of subscriptions, onboarding/offboarding etc) to save you time and money. Check it out! https://www.subble.com/ </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/d-issy/dotfiles). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjUuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQyNS4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
[](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [aquaproj/aqua-registry](https://togithub.com/aquaproj/aqua-registry) | minor | `v4.203.0` -> `v4.205.0` | | [bitnami-labs/sealed-secrets](https://togithub.com/bitnami-labs/sealed-secrets) | patch | `v0.27.0` -> `v0.27.1` | | [casey/just](https://togithub.com/casey/just) | minor | `1.30.1` -> `1.32.0` | | [cli/cli](https://togithub.com/cli/cli) | minor | `v2.52.0` -> `v2.53.0` | | [dagger/dagger](https://togithub.com/dagger/dagger) | patch | `v0.12.0` -> `v0.12.1` | | [eza-community/eza](https://togithub.com/eza-community/eza) | patch | `v0.18.21` -> `v0.18.22` | | [jesseduffield/lazygit](https://togithub.com/jesseduffield/lazygit) | minor | `v0.42.0` -> `v0.43.1` | | [kubernetes/kubectl](https://togithub.com/kubernetes/kubectl) | patch | `1.30.2` -> `1.30.3` | | [leg100/pug](https://togithub.com/leg100/pug) | patch | `v0.4.0` -> `v0.4.2` | | [marcosnils/bin](https://togithub.com/marcosnils/bin) | minor | `v0.17.6` -> `v0.18.0` | | [simulot/immich-go](https://togithub.com/simulot/immich-go) | minor | `0.19.1` -> `0.20.1` | | [smallstep/certificates](https://togithub.com/smallstep/certificates) | patch | `v0.27.0` -> `v0.27.2` | | [smallstep/cli](https://togithub.com/smallstep/cli) | patch | `v0.27.1` -> `v0.27.2` | | [tofuutils/tenv](https://togithub.com/tofuutils/tenv) | minor | `v2.4.0` -> `v2.6.1` | | [twpayne/chezmoi](https://togithub.com/twpayne/chezmoi) | minor | `v2.50.0` -> `v2.51.0` | | [weaveworks/eksctl](https://togithub.com/weaveworks/eksctl) | minor | `v0.186.0` -> `v0.187.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>aquaproj/aqua-registry (aquaproj/aqua-registry)</summary> ### [`v4.205.0`](https://togithub.com/aquaproj/aqua-registry/releases/tag/v4.205.0) [Compare Source](https://togithub.com/aquaproj/aqua-registry/compare/v4.204.0...v4.205.0) [Issues](https://togithub.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.205.0) | [Pull Requests](https://togithub.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.205.0) | https://github.com/aquaproj/aqua-registry/compare/v4.204.0...v4.205.0 #### 🎉 New Packages [#​24983](https://togithub.com/aquaproj/aqua-registry/issues/24983) [fujiwara/iam-policy-finder](https://togithub.com/fujiwara/iam-policy-finder): iam-policy-finder is finder of AWS IAM Policies [#​24976](https://togithub.com/aquaproj/aqua-registry/issues/24976) [jubako/arx](https://togithub.com/jubako/arx): Store files and directory in an archive. Like tar, but faster and with direct random access [@​NikitaCOEUR](https://togithub.com/NikitaCOEUR) #### Fixes [#​24973](https://togithub.com/aquaproj/aqua-registry/issues/24973) theupdateframework/go-tuf/tuf [#​24974](https://togithub.com/aquaproj/aqua-registry/issues/24974) theupdateframework/go-tuf/tuf-client They decided to leave go-tuf as a library only. https://github.com/theupdateframework/go-tuf/releases/tag/v2.0.0 ### [`v4.204.0`](https://togithub.com/aquaproj/aqua-registry/releases/tag/v4.204.0) [Compare Source](https://togithub.com/aquaproj/aqua-registry/compare/v4.203.0...v4.204.0) [Issues](https://togithub.com/aquaproj/aqua-registry/issues?q=is%3Aissue+milestone%3Av4.204.0) | [Pull Requests](https://togithub.com/aquaproj/aqua-registry/pulls?q=is%3Apr+milestone%3Av4.204.0) | https://github.com/aquaproj/aqua-registry/compare/v4.203.0...v4.204.0 #### 🎉 New Packages [#​24940](https://togithub.com/aquaproj/aqua-registry/issues/24940) [eficode/wait-for](https://togithub.com/eficode/wait-for): ./wait-for is a script to wait for another service to become available [@​YumaFuu](https://togithub.com/YumaFuu) #### Fixes [#​24935](https://togithub.com/aquaproj/aqua-registry/issues/24935) cyberark/kubeletctl: Regenerate the setting [#​24878](https://togithub.com/aquaproj/aqua-registry/issues/24878) Enter-tainer/typstyle: Follow up changes of typstyle v0.11.29 </details> <details> <summary>bitnami-labs/sealed-secrets (bitnami-labs/sealed-secrets)</summary> ### [`v0.27.1`](https://togithub.com/bitnami-labs/sealed-secrets/blob/HEAD/RELEASE-NOTES.md#v0271) [Compare Source](https://togithub.com/bitnami-labs/sealed-secrets/compare/v0.27.0...v0.27.1) - chore: Update dependencies ([#​1565](https://togithub.com/bitnami-labs/sealed-secrets/pull/1565)) - chore: Bump golang.org/x/crypto from 0.24.0 to 0.25.0 ([#​1561](https://togithub.com/bitnami-labs/sealed-secrets/pull/1561)) - chore: Bump k8s.io/klog/v2 from 2.130.0 to 2.130.1 ([#​1558](https://togithub.com/bitnami-labs/sealed-secrets/pull/1558)) - chore: Improve release process ([#​1559](https://togithub.com/bitnami-labs/sealed-secrets/pull/1559)) </details> <details> <summary>casey/just (casey/just)</summary> ### [`v1.32.0`](https://togithub.com/casey/just/blob/HEAD/CHANGELOG.md#1320---2024-07-17) [Compare Source](https://togithub.com/casey/just/compare/1.31.0...1.32.0) ##### Added - Add unstable `[script(…)]` attribute ([#​2259](https://togithub.com/casey/just/pull/2259) by [casey](https://togithub.com/casey)) - Add `[extension: 'EXT']` attribute to set shebang recipe script file extension ([#​2256](https://togithub.com/casey/just/pull/2256) by [casey](https://togithub.com/casey)) - Suppress mod doc comment with empty `[doc]` attribute ([#​2254](https://togithub.com/casey/just/pull/2254) by [casey](https://togithub.com/casey)) - Allow `[doc]` annotation on modules ([#​2247](https://togithub.com/casey/just/pull/2247) by [neunenak](https://togithub.com/neunenak)) ### [`v1.31.0`](https://togithub.com/casey/just/blob/HEAD/CHANGELOG.md#1310---2024-07-14) [Compare Source](https://togithub.com/casey/just/compare/1.30.1...1.31.0) ##### Stabilized - Stabilize modules ([#​2250](https://togithub.com/casey/just/pull/2250) by [casey](https://togithub.com/casey)) ##### Added - Allow `mod` path to be directory containing module source ([#​2238](https://togithub.com/casey/just/pull/2238) by [casey](https://togithub.com/casey)) - Allow enabling unstable features with `set unstable` ([#​2237](https://togithub.com/casey/just/pull/2237) by [casey](https://togithub.com/casey)) - Allow abbreviating functions ending in `_directory` to `_dir` ([#​2235](https://togithub.com/casey/just/pull/2235) by [casey](https://togithub.com/casey)) ##### Fixed - Lexiclean search directory so `..` does not check the current directory ([#​2236](https://togithub.com/casey/just/pull/2236) by [casey](https://togithub.com/casey)) ##### Misc - Print space before submodules in `--list` with groups ([#​2244](https://togithub.com/casey/just/pull/2244) by [casey](https://togithub.com/casey)) </details> <details> <summary>cli/cli (cli/cli)</summary> ### [`v2.53.0`](https://togithub.com/cli/cli/releases/tag/v2.53.0): GitHub CLI 2.53.0 [Compare Source](https://togithub.com/cli/cli/compare/v2.52.0...v2.53.0) #### What's Changed - Add `--json` option to `variable get` command by [@​babakks](https://togithub.com/babakks) in [https://github.com/cli/cli/pull/9128](https://togithub.com/cli/cli/pull/9128) - Add GH_DEBUG to issue template by [@​TWiStErRob](https://togithub.com/TWiStErRob) in [https://github.com/cli/cli/pull/9167](https://togithub.com/cli/cli/pull/9167) - Fetch variable selected repo relationship when required by [@​williammartin](https://togithub.com/williammartin) in [https://github.com/cli/cli/pull/9256](https://togithub.com/cli/cli/pull/9256) - build(deps): bump github.com/hashicorp/go-retryablehttp from 0.7.5 to 0.7.7 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/cli/cli/pull/9250](https://togithub.com/cli/cli/pull/9250) - Alternate gh attestation trusted-root subcommand by [@​steiza](https://togithub.com/steiza) in [https://github.com/cli/cli/pull/9206](https://togithub.com/cli/cli/pull/9206) - fix: indentation in 'gh release create --help' by [@​cchristous](https://togithub.com/cchristous) in [https://github.com/cli/cli/pull/9296](https://togithub.com/cli/cli/pull/9296) - build(deps): bump actions/attest-build-provenance from 1.3.2 to 1.3.3 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/cli/cli/pull/9305](https://togithub.com/cli/cli/pull/9305) - docs: Update documentation for `gh repo create` to clarify owner by [@​jessehouwing](https://togithub.com/jessehouwing) in [https://github.com/cli/cli/pull/9309](https://togithub.com/cli/cli/pull/9309) - Fix panic when calling `gh pr view --json stateReason` by [@​williammartin](https://togithub.com/williammartin) in [https://github.com/cli/cli/pull/9307](https://togithub.com/cli/cli/pull/9307) - Add `issue create --editor` by [@​notomo](https://togithub.com/notomo) in [https://github.com/cli/cli/pull/7193](https://togithub.com/cli/cli/pull/7193) - Add `pr update-branch` command by [@​babakks](https://togithub.com/babakks) in [https://github.com/cli/cli/pull/8953](https://togithub.com/cli/cli/pull/8953) #### New Contributors - [@​TWiStErRob](https://togithub.com/TWiStErRob) made their first contribution in [https://github.com/cli/cli/pull/9167](https://togithub.com/cli/cli/pull/9167) - [@​cchristous](https://togithub.com/cchristous) made their first contribution in [https://github.com/cli/cli/pull/9296](https://togithub.com/cli/cli/pull/9296) - [@​jessehouwing](https://togithub.com/jessehouwing) made their first contribution in [https://github.com/cli/cli/pull/9309](https://togithub.com/cli/cli/pull/9309) - [@​notomo](https://togithub.com/notomo) made their first contribution in [https://github.com/cli/cli/pull/7193](https://togithub.com/cli/cli/pull/7193) **Full Changelog**: https://github.com/cli/cli/compare/v2.52.0...v2.53.0 </details> <details> <summary>dagger/dagger (dagger/dagger)</summary> ### [`v0.12.1`](https://togithub.com/dagger/dagger/blob/HEAD/CHANGELOG.md#v0121---2024-07-18) [Compare Source](https://togithub.com/dagger/dagger/compare/helm/chart/v0.12.0...v0.12.1) ##### Added - cli: add support for passing `Socket`s as arguments from the CLI to Functions by [@​sipsma](https://togithub.com/sipsma) in [https://github.com/dagger/dagger/pull/7804](https://togithub.com/dagger/dagger/pull/7804) - cli: new `--compat` flag for develop to target a specific api version by [@​jedevc](https://togithub.com/jedevc) in [https://github.com/dagger/dagger/pull/7948](https://togithub.com/dagger/dagger/pull/7948) ##### Changed - cloud: traces are not uploaded for `dagger version`/`dagger login`/`dagger logout`/etc by [@​jedevc](https://togithub.com/jedevc) in [https://github.com/dagger/dagger/pull/7928](https://togithub.com/dagger/dagger/pull/7928) ##### Fixed - core: allow `@` in local module name by [@​grouville](https://togithub.com/grouville) in [https://github.com/dagger/dagger/pull/7891](https://togithub.com/dagger/dagger/pull/7891) - cli: fix `dagger version` sometimes disappearing by [@​jedevc](https://togithub.com/jedevc) in [https://github.com/dagger/dagger/pull/7919](https://togithub.com/dagger/dagger/pull/7919) - cli: avoid api errors when calling modules in compat mode by [@​jedevc](https://togithub.com/jedevc) in [https://github.com/dagger/dagger/pull/7924](https://togithub.com/dagger/dagger/pull/7924) ##### What to do next? - Read the [documentation](https://docs.dagger.io) - Join our [Discord server](https://discord.gg/dagger-io) - Follow us on [Twitter](https://twitter.com/dagger_io) </details> <details> <summary>eza-community/eza (eza-community/eza)</summary> ### [`v0.18.22`](https://togithub.com/eza-community/eza/releases/tag/v0.18.22): eza v0.18.22 [Compare Source](https://togithub.com/eza-community/eza/compare/v0.18.21...v0.18.22) ### Changelog ##### Bug Fixes - Use NaiveDateTime::from_timestamp_opt instead of panicky From impl ##### Features - Add non-nix pre-commit rustfmt and clippy hooks ##### Miscellaneous Tasks - Release eza v0.18.22 ##### Ci - Bump FreeBSD version. ### Checksums #### sha256sum 44d169690bfd30b289b7f1333eda3138bafde087a72905082ca637821173effa ./target/bin-0.18.22/eza_aarch64-unknown-linux-gnu.tar.gz 9cb87fa6bc8a7a9706117ea860c0605c34520be2e73d771f918c5396657a07b2 ./target/bin-0.18.22/eza_aarch64-unknown-linux-gnu.zip 95044a88dfff520b7e62796f3183e677956dd10a0815faaee9f8439b4fc7a59b ./target/bin-0.18.22/eza_arm-unknown-linux-gnueabihf.tar.gz d8a416b3debeca1ee6163d6981d37fdf661f9093652aa79a8deaa0d2ba8373cd ./target/bin-0.18.22/eza_arm-unknown-linux-gnueabihf.zip b2566b74e79916e74f4d9accd6fbc4a5f80620feef525c938b8b4af2ddf071fb ./target/bin-0.18.22/eza.exe_x86_64-pc-windows-gnu.tar.gz e4a6cf5a65d62e5aae3797ffc1038bad333979af215501c44c0774fb8eaf7e81 ./target/bin-0.18.22/eza.exe_x86_64-pc-windows-gnu.zip 3696d753ede06f152a08b97990ea28204fbbc6370fdc656fa2ac98a79172d321 ./target/bin-0.18.22/eza_x86_64-unknown-linux-gnu.tar.gz 97d990cc4a8daa2d6df2d1d74b79852ed9aff32da754a69a06e21635cf0d5784 ./target/bin-0.18.22/eza_x86_64-unknown-linux-gnu.zip 2e232c36fea64232dc5bb90106526a02b715a6b3d9228e96c88b4a80d19d77f7 ./target/bin-0.18.22/eza_x86_64-unknown-linux-musl.tar.gz 5de73ad1de0e83d5f50fdbcd0abc5cea91922974c38facfc5b94b874c54e0a3e ./target/bin-0.18.22/eza_x86_64-unknown-linux-musl.zip #### md5sum a7d08280d0a0537d3ba5e52fe6545de8 ./target/bin-0.18.22/eza_aarch64-unknown-linux-gnu.tar.gz 94d01b1c3c1f1dbf5b79d77c939ef571 ./target/bin-0.18.22/eza_aarch64-unknown-linux-gnu.zip 6bf1b77d43377aaa2f8cc57edeaf7704 ./target/bin-0.18.22/eza_arm-unknown-linux-gnueabihf.tar.gz 50e326b0cb16f2d84c557c523e056d06 ./target/bin-0.18.22/eza_arm-unknown-linux-gnueabihf.zip 3c8e4c406f0d70439135f8e3c10c3ec5 ./target/bin-0.18.22/eza.exe_x86_64-pc-windows-gnu.tar.gz 3485d5eacfe406699515afbe4aee120a ./target/bin-0.18.22/eza.exe_x86_64-pc-windows-gnu.zip 7ed4eb635865db97ffd3dc56ddf91c59 ./target/bin-0.18.22/eza_x86_64-unknown-linux-gnu.tar.gz 5e25fca63e2e7b821ce2bd67bdd55f3a ./target/bin-0.18.22/eza_x86_64-unknown-linux-gnu.zip 701b7ca1265d7296426879a0e5dbd780 ./target/bin-0.18.22/eza_x86_64-unknown-linux-musl.tar.gz 85c58902f9b258bda8ef11e3078eabd6 ./target/bin-0.18.22/eza_x86_64-unknown-linux-musl.zip #### blake3sum d601558902d9b37789a1dd5cc7ac07ba568a08d0332d0565f4731f626f295455 ./target/bin-0.18.22/eza_aarch64-unknown-linux-gnu.tar.gz c121fbb02f6a8830379f5e09b8ba8fec4930c13fcc97c13c2c6a38bb1a69ea78 ./target/bin-0.18.22/eza_aarch64-unknown-linux-gnu.zip d1ad617acff9e2937ae704e6049ca2de602ff631c6b14d6ab7bd07643e3e398b ./target/bin-0.18.22/eza_arm-unknown-linux-gnueabihf.tar.gz 04cbdaba7017355206e3f19eae68c9fe0d82cbcbbe3ba2c2d984587e6b64e090 ./target/bin-0.18.22/eza_arm-unknown-linux-gnueabihf.zip 07ec4870fcd8c286e26fdfa71bf6c2ffba3a81215dab6d6b8f4e263495358a95 ./target/bin-0.18.22/eza.exe_x86_64-pc-windows-gnu.tar.gz 3777bf16336129ec08a8c17454b93468d0720982e29b6f254ad4b029bd5cbdd3 ./target/bin-0.18.22/eza.exe_x86_64-pc-windows-gnu.zip baa96e4a11e94ea8d018db3fb8ff54b1b8a5a239b230a98881c46985c212128e ./target/bin-0.18.22/eza_x86_64-unknown-linux-gnu.tar.gz 801302508b309f6c7f9c2d8e8370f4b1f95be6db1dfa2802b2b56bde2e9e2a3d ./target/bin-0.18.22/eza_x86_64-unknown-linux-gnu.zip f487e3da49df08bb7b1117b40435367c0d49fb1aad9e09b2461785d9ecd2f378 ./target/bin-0.18.22/eza_x86_64-unknown-linux-musl.tar.gz eb0ac34a386ad2144c92b3327a57682c62bc8bd8ca48382694da22d4ca1d4e1d ./target/bin-0.18.22/eza_x86_64-unknown-linux-musl.zip </details> <details> <summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.43.1`](https://togithub.com/jesseduffield/lazygit/releases/tag/v0.43.1) [Compare Source](https://togithub.com/jesseduffield/lazygit/compare/v0.43.0...v0.43.1) <!-- Release notes generated using configuration in .github/release.yml at v0.43.1 --> #### What's Changed ##### Fixes 🔧 - Fix language auto detection by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3744](https://togithub.com/jesseduffield/lazygit/pull/3744) **Full Changelog**: https://github.com/jesseduffield/lazygit/compare/v0.43.0...v0.43.1 ### [`v0.43.0`](https://togithub.com/jesseduffield/lazygit/releases/tag/v0.43.0) [Compare Source](https://togithub.com/jesseduffield/lazygit/compare/v0.42.0...v0.43.0) #### What's Changed Thanks to all contributors who helped make this release happen! There's a lot of first-time contributors on this release as well so kudos to you all. There's quite a few things in this release. I'm going to single out a couple that have changed my workflow. ##### Base branch stuff https://github.com/user-attachments/assets/9f50824a-6221-4ca0-9cf3-a4d45cc43262 ##### Easier rebase onto base branch *(Add command to rebase onto base branch by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3615](https://togithub.com/jesseduffield/lazygit/pull/3615))* When my feature branch gets out of date with the main branch, I like to rebase it onto the main branch. Up until now, that's required: - Navigating to the main branch - Pressing 'f' to fast-forward it onto its upstream branch - Pressing 'r' to rebase the checked-out branch onto the main branch That takes too long! Now you can just press 'r' followed by 'b' to rebase onto the base branch (which defaults to origin/main). ##### See the divergence count from the base branch *(Divergence from base branch display by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3613](https://togithub.com/jesseduffield/lazygit/pull/3613))* You can now also configure to see the divergence from a branch and its base branch with the following config: ```yml gui: showDivergenceFromBaseBranch: arrowAndNumber # or 'onlyArrow' ``` This shows the divergence count in blue, next to the yellow count of divergence from the upstream branch. This is admittedly noisy, so it's an opt-in feature. But I think the noise is worth it. If you set the config value to 'onlyArrow' it's a lot less noisy: <img width="891" alt="image" src="https://github.com/user-attachments/assets/470cb003-8fc6-4a72-aa04-6e228c49f381"> ##### See detailed divergence from base branch *(Add command to show divergence from base branch as a left-right log by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3614](https://togithub.com/jesseduffield/lazygit/pull/3614))* By pressing 'u' then 'b' on a branch you can see the divergence view for that branch compared to its base branch ##### Improved 'Find commit for fixup' feature *(Improve the "Find base commit for fixup" command by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3602](https://togithub.com/jesseduffield/lazygit/pull/3602))* 'Find commit for fixup' is not a very catchy name for this feature but I can't think of anything better at the moment. Nevertheless! The idea is that you often want to know for a given set of changes, which commit ought they be included in? Just press `ctrl+f` when in the files panel and lazygit will jump the cursor to the appropriate commit to fixup. With this release, the feature is smarter and more lenient so it's more likely to find you a match. If you haven't tried this out you should really give it a go! https://github.com/user-attachments/assets/220e4190-b631-40a5-b8dc-7d1a6116ab09 ##### Other Enhancements 🔥 - Add Squash merge by [@​noahfraiture](https://togithub.com/noahfraiture) in [https://github.com/jesseduffield/lazygit/pull/3566](https://togithub.com/jesseduffield/lazygit/pull/3566) - Now when you press `shift+m` you get the option to do a regular merge or a squash merge. If you already have muscle memory for regular merge; don't worry: it's the same sequence of keypresses. - Improve "Find base commit for fixup" command when there are changes for master commits by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3645](https://togithub.com/jesseduffield/lazygit/pull/3645) - Allow setting the similarity threshold for detecting renames by [@​isti115](https://togithub.com/isti115) in [https://github.com/jesseduffield/lazygit/pull/3025](https://togithub.com/jesseduffield/lazygit/pull/3025) - For this, press ')' and '(' to increase/decrease the similarity threshold. https://github.com/user-attachments/assets/a85825b8-9110-4090-ba89-ba8221cbc7a8 - Reduce memory consumption when loading large number of commits by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3687](https://togithub.com/jesseduffield/lazygit/pull/3687) - 2-6x less memory usage when dealing with lots of commits. HUGE improvement. - Focus on local commits view after moving code into new commit by [@​AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3577](https://togithub.com/jesseduffield/lazygit/pull/3577) - Add property outputTitle to CustomCommand by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3579](https://togithub.com/jesseduffield/lazygit/pull/3579) - Add user config `gui.expandedSidePanelWeight` by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3623](https://togithub.com/jesseduffield/lazygit/pull/3623) - You can now increase the height of the selected side panel when you've configured the accordion effect ```yml gui: expandFocusedSidePanel: true expandedSidePanelWeight: 3 ``` <img width="891" alt="image" src="https://github.com/user-attachments/assets/8a47bd1c-67b0-4d2f-a885-56e6a07ece12"> - Support range select for amending commit attributes by [@​AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3587](https://togithub.com/jesseduffield/lazygit/pull/3587) - This lets you select a range of commits and update the author / set the co-author on all of them at once. https://github.com/user-attachments/assets/2d3e15a9-4acc-4b81-b0e2-a34490ad77ad - Show "exec" todos in the list of rebase todos by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3654](https://togithub.com/jesseduffield/lazygit/pull/3654) - Search the model instead of the view in the commits panel by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3642](https://togithub.com/jesseduffield/lazygit/pull/3642) - Add prompt to the remote branch checkout menu by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3652](https://togithub.com/jesseduffield/lazygit/pull/3652) - Always show the "Discard unchanged changes" menu item by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3683](https://togithub.com/jesseduffield/lazygit/pull/3683) - Show current value in menus by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3628](https://togithub.com/jesseduffield/lazygit/pull/3628) - Add command to paste commit message from clipboard by [@​WaterLemons2k](https://togithub.com/WaterLemons2k) in [https://github.com/jesseduffield/lazygit/pull/3676](https://togithub.com/jesseduffield/lazygit/pull/3676) - Stagger popup panels by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3694](https://togithub.com/jesseduffield/lazygit/pull/3694) - Make commit author length configurable by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3688](https://togithub.com/jesseduffield/lazygit/pull/3688) (initial implementation by [@​anikiforov](https://togithub.com/anikiforov)) - Make opening git difftool more consistent by [@​part22](https://togithub.com/part22) in [https://github.com/jesseduffield/lazygit/pull/3691](https://togithub.com/jesseduffield/lazygit/pull/3691) - Update tracking behaviour for branches created from remote branches by [@​part22](https://togithub.com/part22) in [https://github.com/jesseduffield/lazygit/pull/3712](https://togithub.com/jesseduffield/lazygit/pull/3712) - Allow setting a default name when creating new branches by [@​elliotcubit](https://togithub.com/elliotcubit) in [https://github.com/jesseduffield/lazygit/pull/3487](https://togithub.com/jesseduffield/lazygit/pull/3487) - Add Token credential request handling by [@​gmlexx](https://togithub.com/gmlexx) in [https://github.com/jesseduffield/lazygit/pull/3647](https://togithub.com/jesseduffield/lazygit/pull/3647) - Switch between multiple log views by [@​mkock](https://togithub.com/mkock) in [https://github.com/jesseduffield/lazygit/pull/3354](https://togithub.com/jesseduffield/lazygit/pull/3354) - Faster startup by [@​jwhitley](https://togithub.com/jwhitley) in [https://github.com/jesseduffield/lazygit/pull/3284](https://togithub.com/jesseduffield/lazygit/pull/3284) - Extend icon coverage on remotes and file extensions by [@​hasecilu](https://togithub.com/hasecilu) in [https://github.com/jesseduffield/lazygit/pull/3484](https://togithub.com/jesseduffield/lazygit/pull/3484) - Add nerdfont icons for .bicep & .bicepparam files by [@​scottmckendry](https://togithub.com/scottmckendry) in [https://github.com/jesseduffield/lazygit/pull/3053](https://togithub.com/jesseduffield/lazygit/pull/3053) ##### Fixes 🔧 - Fix tooltip for fixup command by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3601](https://togithub.com/jesseduffield/lazygit/pull/3601) - Fix pushing to branch when upstream not stored locally by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3619](https://togithub.com/jesseduffield/lazygit/pull/3619) - ([#​3618](https://togithub.com/jesseduffield/lazygit/issues/3618)) Fix pushing a branch to remote with a different name causing error by [@​JordanllHarper](https://togithub.com/JordanllHarper) in [https://github.com/jesseduffield/lazygit/pull/3630](https://togithub.com/jesseduffield/lazygit/pull/3630) - Fix secondary window resize by [@​AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3637](https://togithub.com/jesseduffield/lazygit/pull/3637) - Fix truncation of branch names containing non-ASCII characters by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3685](https://togithub.com/jesseduffield/lazygit/pull/3685) - Fix duplicate keybinding suggestions in status bar after switching repos by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3660](https://togithub.com/jesseduffield/lazygit/pull/3660) - Fix PTY layout problems by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3658](https://togithub.com/jesseduffield/lazygit/pull/3658) - Fix custom patch operations for added files by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3684](https://togithub.com/jesseduffield/lazygit/pull/3684) - Improve render performance by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3686](https://togithub.com/jesseduffield/lazygit/pull/3686) - Fix wrong highlight in staging panel when entering file with only staged changes by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3667](https://togithub.com/jesseduffield/lazygit/pull/3667) - Always reapply filters on filtered views when model changes, even inactive ones by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3697](https://togithub.com/jesseduffield/lazygit/pull/3697) - Turn off the highlight of the suggestions panel when it loses focus by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3696](https://togithub.com/jesseduffield/lazygit/pull/3696) - Fix running lazygit with a language other than English on Windows by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3705](https://togithub.com/jesseduffield/lazygit/pull/3705) - Fix multi selection stage/discard not working for files with substrings by [@​brandondong](https://togithub.com/brandondong) in [https://github.com/jesseduffield/lazygit/pull/3599](https://togithub.com/jesseduffield/lazygit/pull/3599) - Only add commit prefix if branch name matches regex pattern by [@​phaze-ZA](https://togithub.com/phaze-ZA) in [https://github.com/jesseduffield/lazygit/pull/3703](https://togithub.com/jesseduffield/lazygit/pull/3703) ##### Maintenance ⚙️ - Add default lazygit config generation in Config.md from JSON schema by [@​karimkhaleel](https://togithub.com/karimkhaleel) in [https://github.com/jesseduffield/lazygit/pull/3565](https://togithub.com/jesseduffield/lazygit/pull/3565) - Remove hint about Config.md from PR template by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3578](https://togithub.com/jesseduffield/lazygit/pull/3578) - Add `copyloopvar` to enabled linters by [@​kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/3586](https://togithub.com/jesseduffield/lazygit/pull/3586) - Add `lint` to make target by [@​kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/3593](https://togithub.com/jesseduffield/lazygit/pull/3593) - Delete the TODO comment about enabling `goconst` in the future from `.golangci.yml` by [@​kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/3596](https://togithub.com/jesseduffield/lazygit/pull/3596) - Pin golangci version to 1.58 by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3611](https://togithub.com/jesseduffield/lazygit/pull/3611) - Improve branch and reflog loading when sorting branches by date by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3609](https://togithub.com/jesseduffield/lazygit/pull/3609) - Fix boolean config keys not appearing in the generated Config.md by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3622](https://togithub.com/jesseduffield/lazygit/pull/3622) - Make profiling easier by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3634](https://togithub.com/jesseduffield/lazygit/pull/3634) - Update `rebase_onto` demo test to match new the rebase menu title by [@​AzraelSec](https://togithub.com/AzraelSec) in [https://github.com/jesseduffield/lazygit/pull/3636](https://togithub.com/jesseduffield/lazygit/pull/3636) - Include demos when running integration tests on CI by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3640](https://togithub.com/jesseduffield/lazygit/pull/3640) - Fix reporting of unexpected selections in integration tests by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3662](https://togithub.com/jesseduffield/lazygit/pull/3662) - Convert TranslationSets to json by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3649](https://togithub.com/jesseduffield/lazygit/pull/3649) - Fix go generate on windows by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3706](https://togithub.com/jesseduffield/lazygit/pull/3706) - Update translations from Crowdin by [@​stefanhaller](https://togithub.com/stefanhaller) in [https://github.com/jesseduffield/lazygit/pull/3707](https://togithub.com/jesseduffield/lazygit/pull/3707) - Bump `actions/checkout`, `actions/setup-go`, `actions/cache/restore`, `actions/cache/save` by [@​kyu08](https://togithub.com/kyu08) in [https://github.com/jesseduffield/lazygit/pull/3594](https://togithub.com/jesseduffield/lazygit/pull/3594) - Check for fixup commits on CI by [@​jesseduffield](https://togithub.com/jesseduffield) in [https://github.com/jesseduffield/lazygit/pull/3742](https://togithub.com/jesseduffield/lazygit/pull/3742) ##### Docs 📖 - Upgrade to Alpine Linux v3.19 by [@​fossdd](https://togithub.com/fossdd) in [https://github.com/jesseduffield/lazygit/pull/3541](https://togithub.com/jesseduffield/lazygit/pull/3541) - Add flox install by [@​bryanhonof](https://togithub.com/bryanhonof) in [https://github.com/jesseduffield/lazygit/pull/3656](https://togithub.com/jesseduffield/lazygit/pull/3656) #### New Contributors - [@​JordanllHarper](https://togithub.com/JordanllHarper) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3630](https://togithub.com/jesseduffield/lazygit/pull/3630) - [@​anikiforov](https://togithub.com/anikiforov) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3625](https://togithub.com/jesseduffield/lazygit/pull/3625) - [@​WaterLemons2k](https://togithub.com/WaterLemons2k) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3676](https://togithub.com/jesseduffield/lazygit/pull/3676) - [@​noahfraiture](https://togithub.com/noahfraiture) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3566](https://togithub.com/jesseduffield/lazygit/pull/3566) - [@​fossdd](https://togithub.com/fossdd) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3541](https://togithub.com/jesseduffield/lazygit/pull/3541) - [@​scottmckendry](https://togithub.com/scottmckendry) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3053](https://togithub.com/jesseduffield/lazygit/pull/3053) - [@​elliotcubit](https://togithub.com/elliotcubit) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3487](https://togithub.com/jesseduffield/lazygit/pull/3487) - [@​bryanhonof](https://togithub.com/bryanhonof) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3656](https://togithub.com/jesseduffield/lazygit/pull/3656) - [@​gmlexx](https://togithub.com/gmlexx) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3647](https://togithub.com/jesseduffield/lazygit/pull/3647) - [@​mkock](https://togithub.com/mkock) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3354](https://togithub.com/jesseduffield/lazygit/pull/3354) - [@​phaze-ZA](https://togithub.com/phaze-ZA) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3703](https://togithub.com/jesseduffield/lazygit/pull/3703) - [@​hasecilu](https://togithub.com/hasecilu) made their first contribution in [https://github.com/jesseduffield/lazygit/pull/3484](https://togithub.com/jesseduffield/lazygit/pull/3484) **Full Changelog**: https://github.com/jesseduffield/lazygit/compare/v0.42.0...v0.43.0 #### Shameless Plug I (Jesse) quit my day job and co-founded Subble, a startup that helps your company manage its SaaS subscriptions (discovery of subscriptions, onboarding/offboarding etc) to save you time and money. Check it out! https://www.subble.com/ </details> <details> <summary>kubernetes/kubectl (kubernetes/kubectl)</summary> ### [`v1.30.3`](https://togithub.com/kubernetes/kubectl/compare/kubernetes-1.30.2...kubernetes-1.30.3) [Compare Source](https://togithub.com/kubernetes/kubectl/compare/kubernetes-1.30.2...kubernetes-1.30.3) </details> <details> <summary>leg100/pug (leg100/pug)</summary> ### [`v0.4.2`](https://togithub.com/leg100/pug/releases/tag/v0.4.2) [Compare Source](https://togithub.com/leg100/pug/compare/v0.4.1...v0.4.2) ##### Bug Fixes - handle external terragrunt dep without panic ([#​101](https://togithub.com/leg100/pug/issues/101)) ([518b60f](https://togithub.com/leg100/pug/commit/518b60f570f9b0d8cb4087fa976f55eeadfbe82c)) ### [`v0.4.1`](https://togithub.com/leg100/pug/releases/tag/v0.4.1) [Compare Source](https://togithub.com/leg100/pug/compare/v0.4.0...v0.4.1) ##### Bug Fixes - panic when pressing enter on state resource ([#​98](https://togithub.com/leg100/pug/issues/98)) ([142dde7](https://togithub.com/leg100/pug/commit/142dde7df8af36914f573bf5edc52dec8f04997a)) - state parsing string index keys ([#​99](https://togithub.com/leg100/pug/issues/99)) ([dd0b91f](https://togithub.com/leg100/pug/commit/dd0b91fc6ba148d9eaa35068f78f5e61c3cb89f4)) ##### Miscellaneous - update readme ([66cf084](https://togithub.com/leg100/pug/commit/66cf084ddfb2a09591f9e0c8c4ba90068933b369)) - update readme ([6e6f2a5](https://togithub.com/leg100/pug/commit/6e6f2a5dd72911ce6a07d846a1237dc5d3be012c)) </details> <details> <summary>marcosnils/bin (marcosnils/bin)</summary> ### [`v0.18.0`](https://togithub.com/marcosnils/bin/releases/tag/v0.18.0) [Compare Source](https://togithub.com/marcosnils/bin/compare/v0.17.6...v0.18.0) #### Changelog - [`91ae3e6`](https://togithub.com/marcosnils/bin/commit/91ae3e63bc1e2a499a832ba5f4e44d3c071b1345) bump goreleaser version - [`0d011d5`](https://togithub.com/marcosnils/bin/commit/0d011d57d3066cbafb37ef95d9c1bd9723b09c4e) make ensure check file hash ([#​206](https://togithub.com/marcosnils/bin/issues/206)) </details> <details> <summary>simulot/immich-go (simulot/immich-go)</summary> ### [`v0.20.1`](https://togithub.com/simulot/immich-go/releases/tag/0.20.1) [Compare Source](https://togithub.com/simulot/immich-go/compare/0.20...0.20.1) #### Release 0.20.1 ##### changes - add git action to build and release ##### fixes: - [#​380](https://togithub.com/simulot/immich-go/issues/380) not all GP duplicates are detected correctly, counters are wrong ### [`v0.20`](https://togithub.com/simulot/immich-go/releases/tag/0.20) [Compare Source](https://togithub.com/simulot/immich-go/compare/0.19.1...0.20) ##### Feature: exclude files based on a pattern Use the `-exclude-files=PATTERN` to exclude certain files or directories from the upload. Repeat the option for each pattern do you need. The following directories are excluded automatically: - @​eaDir/ - @​\__thumb/ - SYNOFILE_THUMB_\*.\* - Lightroom Catalog/ - thumbnails/ - .DS_Store/ Example, the following command excludes any files in directories called backup or draft and any file with name finishing with "copy)" as PXL\_20231006\_063121958 (another copy).jpg: ```sh immich-go -sever=xxxxx -key=yyyyy upload -exclude-files=backup/ -exclude-files=draft/ -exclude=copy).* /path/to/your/files ``` ##### Fixes: - [#​365](https://togithub.com/simulot/immich-go/issues/365) missing associated metadata file isn't correct - [#​299](https://togithub.com/simulot/immich-go/issues/299) Real time GUI log only shows 4 lines - [#​370](https://togithub.com/simulot/immich-go/issues/370) ui: clearly mention when the upload in completed - [#​232](https://togithub.com/simulot/immich-go/issues/232) Exclude based on filename / glob - [#​357](https://togithub.com/simulot/immich-go/issues/357) clarify error message when a zip file is corrupted </details> <details> <summary>smallstep/certificates (smallstep/certificates)</summary> ### [`v0.27.2`](https://togithub.com/smallstep/certificates/releases/tag/v0.27.2): Step CA v0.27.2 (24-07-18) [Compare Source](https://togithub.com/smallstep/certificates/compare/v0.27.1...v0.27.2) #### Official Release Artifacts ##### Linux - 📦 [step-ca_linux\_0.27.2\_amd64.tar.gz](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.2/step-ca_linux\_0.27.2\_amd64.tar.gz) - 📦 [step-ca\_0.27.2\_amd64.deb](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.2/step-ca\_0.27.2\_amd64.deb) ##### OSX Darwin - 📦 [step-ca_darwin\_0.27.2\_amd64.tar.gz](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.2/step-ca_darwin\_0.27.2\_amd64.tar.gz) - 📦 [step-ca_darwin\_0.27.2\_arm64.tar.gz](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.2/step-ca_darwin\_0.27.2\_arm64.tar.gz) ##### Windows - 📦 [step-ca_windows\_0.27.2\_amd64.zip](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.2/step-ca_windows\_0.27.2\_amd64.zip) For more builds across platforms and architectures, see the `Assets` section below. And for packaged versions (Docker, k8s, Homebrew), see our [installation docs](https://smallstep.com/docs/step-ca/installation). Don't see the artifact you need? Open an issue [here](https://togithub.com/smallstep/certificates/issues/new/choose). #### Signatures and Checksums `step-ca` uses [sigstore/cosign](https://togithub.com/sigstore/cosign) for signing and verifying release artifacts. Below is an example using `cosign` to verify a release artifact: cosign verify-blob \ --certificate step-ca_darwin_0.27.2_amd64.tar.gz.sig.pem \ --signature step-ca_darwin_0.27.2_amd64.tar.gz.sig \ --certificate-identity-regexp "https://github\.com/smallstep/workflows/.*" \ --certificate-oidc-issuer https://token.actions.githubusercontent.com \ step-ca_darwin_0.27.2_amd64.tar.gz The `checksums.txt` file (in the `Assets` section below) contains a checksum for every artifact in the release. #### Changelog - [`077f688`](https://togithub.com/smallstep/certificates/commit/077f688e2d781fa12fd3d702cfab5b6f989a4391) Add changelog for 0.27.2 & 0.27.1 | update changelog for 0.27.0 ([#​1934](https://togithub.com/smallstep/certificates/issues/1934)) - [`eb503c7`](https://togithub.com/smallstep/certificates/commit/eb503c7991904298088a8f666336bdf84b1a265b) Merge pull request [#​1931](https://togithub.com/smallstep/certificates/issues/1931) from smallstep/mariano/console - [`797f577`](https://togithub.com/smallstep/certificates/commit/797f577caa718594e8071175ee280b42c4bed98a) Merge pull request [#​1929](https://togithub.com/smallstep/certificates/issues/1929) from smallstep/dependabot/go_modules/go.step.sm/linkedca-0.22.1 - [`61ffb32`](https://togithub.com/smallstep/certificates/commit/61ffb32b091dcb962496da408713122a53d8687c) Merge pull request [#​1928](https://togithub.com/smallstep/certificates/issues/1928) from smallstep/dependabot/go_modules/cloud.google.com/go/security-1.17.3 - [`8b89dd1`](https://togithub.com/smallstep/certificates/commit/8b89dd1afaefb9a00349aed39a6e522af3177828) Update step_config.tpl template - [`b67eb9d`](https://togithub.com/smallstep/certificates/commit/b67eb9d57e05176763378f58cba1de20560039cf) Bump go.step.sm/linkedca from 0.21.1 to 0.22.1 - [`53f616d`](https://togithub.com/smallstep/certificates/commit/53f616d324cc44ad73d1ae194aa0556b3710a7b6) Bump cloud.google.com/go/security from 1.17.0 to 1.17.3 #### Thanks! Those were the changes on v0.27.2! Come join us on [Discord](https://discord.gg/X2RKGwEbV9) to ask questions, chat about PKI, or get a sneak peek at the freshest PKI memes. ### [`v0.27.1`](https://togithub.com/smallstep/certificates/releases/tag/v0.27.1): Step CA v0.27.1 (24-07-12) [Compare Source](https://togithub.com/smallstep/certificates/compare/v0.27.0...v0.27.1) #### Official Release Artifacts ##### Linux - 📦 [step-ca_linux\_0.27.1\_amd64.tar.gz](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.1/step-ca_linux\_0.27.1\_amd64.tar.gz) - 📦 [step-ca\_0.27.1\_amd64.deb](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.1/step-ca\_0.27.1\_amd64.deb) ##### OSX Darwin - 📦 [step-ca_darwin\_0.27.1\_amd64.tar.gz](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.1/step-ca_darwin\_0.27.1\_amd64.tar.gz) - 📦 [step-ca_darwin\_0.27.1\_arm64.tar.gz](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.1/step-ca_darwin\_0.27.1\_arm64.tar.gz) ##### Windows - 📦 [step-ca_windows\_0.27.1\_amd64.zip](https://dl.smallstep.com/gh-release/certificates/gh-release-header/v0.27.1/step-ca_windows\_0.27.1\_amd64.zip) For more builds across platforms and architectures, see the `Assets` section below. And for packaged versions (Docker, k8s, Homebrew), see our [installation docs](https://smallstep.com/docs/step-ca/installation). Don't see the artifact you need? Open an issue [here](https://togithub.com/smallstep/certificates/issues/new/choose). #### Signatures and Checksums `step-ca` uses [sigstore/cosign](https://togithub.com/sigstore/cosign) for signing and verifying release artifacts. Below is an example using `cosign` to verify a release artifact: cosign verify-blob \ --certificate step-ca_darwin_0.27.1_amd64.tar.gz.sig.pem \ --signature step-ca_darwin_0.27.1_amd64.tar.gz.sig \ --certificate-identity-regexp "https://github\.com/smallstep/workflows/.*" \ --certificate-oidc-issuer https://token.actions.githubusercontent.com \ step-ca_darwin_0.27.1_amd64.tar.gz The `checksums.txt` file (in the `Assets` section below) contains a checksum for every artifact in the release. #### Changelog - [`3897771`](https://togithub.com/smallstep/certificates/commit/3897771e) Merge pull request [#​1926](https://togithub.com/smallstep/certificates/issues/1926) from smallstep/mariano/dns - [`3e61796`](https://togithub.com/smallstep/certificates/commit/3e61796d) Add a flag to enable strict DNS resolution - [`0a9dd62`](https://togithub.com/smallstep/certificates/commit/0a9dd62d) \[actions] use ref_name as release name ([#​1924](https://togithub.com/smallstep/certificates/issues/1924)) #### Thanks! Those were the changes on v0.27.1! Come join us on [Discord](https://discord.gg/X2RKGwEbV9) to ask questions, chat about PKI, or get a sneak peek at the freshest PKI memes. </details> <details> <summary>smallstep/cli (smallstep/cli)</summary> ### [`v0.27.2`](https://togithub.com/smallstep/cli/releases/tag/v0.27.2): Step CLI v0.27.2 (24-07-18) [Compare Source](https://togithub.com/smallstep/cli/compare/v0.27.1-rc1...v0.27.2) #### Official Release Artifacts Below are the most popular artifacts for `step` on each platform. For packaged versions (Homebrew, Scoop, etc.), see our [installation docs](https://smallstep.com/docs/step-cli/installation). ##### Linux - 📦 [step_linux\_0.27.2\_amd64.tar.gz](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step_linux\_0.27.2\_amd64.tar.gz) - 📦 [step_linux\_0.27.2\_arm64.tar.gz](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step_linux\_0.27.2\_arm64.tar.gz) - 📦 [step_linux\_0.27.2\_armv7.tar.gz](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step_linux\_0.27.2\_armv7.tar.gz) - 📦 [step-cli\_0.27.2\_amd64.deb](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step-cli\_0.27.2\_amd64.deb) - 📦 [step-cli\_0.27.2\_amd64.rpm](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step-cli\_0.27.2\_amd64.rpm) - 📦 [step-cli\_0.27.2\_arm64.deb](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step-cli\_0.27.2\_arm64.deb) - 📦 [step-cli\_0.27.2\_arm64.rpm](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step-cli\_0.27.2\_arm64.rpm) - see `Assets` below for more builds ##### macOS Darwin - 📦 [step_darwin\_0.27.2\_amd64.tar.gz](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step_darwin\_0.27.2\_amd64.tar.gz) - 📦 [step_darwin\_0.27.2\_arm64.tar.gz](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step_darwin\_0.27.2\_arm64.tar.gz) ##### Windows - 📦 [step_windows\_0.27.2\_amd64.zip](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step_windows\_0.27.2\_amd64.zip) - 📦 [step_windows\_0.27.2\_arm64.zip](https://dl.smallstep.com/gh-release/cli/gh-release-header/v0.27.2/step_windows\_0.27.2\_arm64.zip) #### Signatures and Checksums `step` uses [sigstore/cosign](https://togithub.com/sigstore/cosign) for signing and verifying release artifacts. Below is an example using `cosign` to verify a release artifact: cosign verify-blob \ --certificate ~/Download/step_darwin_0.27.2_amd64.tar.gz.pem \ --signature ~/Downloads/step_darwin_0.27.2_amd64.tar.gz.sig \ --certificate-identity-regexp "https://github\.com/smallstep/workflows/.*" \ --certificate-oidc-issuer https://token.actions.githubusercontent.com \ ~/Downloads/step_darwin_0.27.2_amd64.tar.gz The `checksums.txt` file (in the 'Assets' section below) contains a checksum for every artifact in the release. #### Changelog - [`eeb9a40`](https://togithub.com/smallstep/cli/commit/eeb9a405a231c7586c69f5a57139af19b7f3b3b6) Update changelog for 0.27.2 ([#​1240](https://togithub.com/smallstep/cli/issues/1240)) - [`41a0136`](https://togithub.com/smallstep/cli/commit/41a01363afb0dd5fb2214051f5271b1918b492fc) Upload freebsd binaries to s3 ([#​1239](https://togithub.com/smallstep/cli/issues/1239)) - [`1fa7d00`](https://togithub.com/smallstep/cli/commit/1fa7d003be6771fc306d8db42369f713e0dd6db9) Merge pull request [#​1238](https://togithub.com/smallstep/cli/issues/1238) from smallstep/mariano/console - [`4fc8e4e`](https://togithub.com/smallstep/cli/commit/4fc8e4e289f74b29eae02c2a305afd2e3cf313fa) Merge pull request [#​1237](https://togithub.com/smallstep/cli/issues/1237) from smallstep/dependabot/github_actions/actions/setup-go-5.0.2 - [`5d9510e`](https://togithub.com/smallstep/cli/commit/5d9510e280e200dd7c45069a6e2ade158e77b127) Merge pull request [#​1236](https://togithub.com/smallstep/cli/issues/1236) from smallstep/dependabot/go_modules/github.com/smallstep/certificates-0.27.1 - [`2a6e644`](https://togithub.com/smallstep/cli/commit/2a6e6440004a802c6050c2b3151f66abce2a7bdd) Add console flag to ssh commands - [`06945d7`](https://togithub.com/smallstep/cli/commit/06945d7811786dc43352c7d728a5126e6bc737a2) Bump actions/setup-go from 5.0.1 to 5.0.2 - [`978bad3`](https://togithub.com/smallstep/cli/commit/978bad3b8717ff4263a625f2db1e1fbdc112770f) Bump github.com/smallstep/certificates from 0.27.0 to 0.27.1 - [`3b1e836`](https://togithub.com/smallstep/cli/commit/3b1e836af01ded8d8eb7806794819722981bdd2f) \[actions] use ref_name as name for release ([#​1235](https://togithub.com/smallstep/cli/issues/1235)) #### Thanks! Those were the changes on v0.27.2! Come join us on [Discord](https://discord.gg/X2RKGwEbV9) to ask questions, chat about PKI, or get a sneak peek at the freshest PKI memes. </details> <details> <summary>tofuutils/tenv (tofuutils/tenv)</summary> ### [`v2.6.1`](https://togithub.com/tofuutils/tenv/releases/tag/v2.6.1) [Compare Source](https://togithub.com/tofuutils/tenv/compare/v2.6.0...v2.6.1) #### What's Changed - Fix: proxy exit code with github action by [@​dvaumoron](https://togithub.com/dvaumoron) in [https://github.com/tofuutils/tenv/pull/214](https://togithub.com/tofuutils/tenv/pull/214) **Full Changelog**: https://github.com/tofuutils/tenv/compare/v2.6.0...v2.6.1 ### [`v2.6.0`](https://togithub.com/tofuutils/tenv/releases/tag/v2.6.0) [Compare Source](https://togithub.com/tofuutils/tenv/compare/v2.5.0...v2.6.0) #### What's Changed - add skip-signature flag by [@​dvaumoron](https://togithub.com/dvaumoron) in [https://github.com/tofuutils/tenv/pull/207](https://togithub.com/tofuutils/tenv/pull/207) - fix cosign check in tofu install by [@​dvaumoron](https://togithub.com/dvaumoron) in [https://github.com/tofuutils/tenv/pull/208](https://togithub.com/tofuutils/tenv/pull/208) **Full Changelog**: https://github.com/tofuutils/tenv/compare/v2.5.0...v2.6.0 ### [`v2.5.0`](https://togithub.com/tofuutils/tenv/releases/tag/v2.5.0) [Compare Source](https://togithub.com/tofuutils/tenv/compare/v2.4.0...v2.5.0) #### What's Changed - display last use in list by [@​dvaumoron](https://togithub.com/dvaumoron) in [https://github.com/tofuutils/tenv/pull/204](https://togithub.com/tofuutils/tenv/pull/204) - Interactive uninstall by [@​dvaumoron](https://togithub.com/dvaumoron) in [https://github.com/tofuutils/tenv/pull/205](https://togithub.com/tofuutils/tenv/pull/205) **Full Changelog**: https://github.com/tofuutils/tenv/compare/v2.4.0...v2.5.0 </details> <details> <summary>twpayne/chezmoi (twpayne/chezmoi)</summary> ### [`v2.51.0`](https://togithub.com/twpayne/chezmoi/releases/tag/v2.51.0) [Compare Source](https://togithub.com/twpayne/chezmoi/compare/v2.50.0...v2.51.0) #### Changelog ##### Features - [`2a7845f`](https://togithub.com/twpayne/chezmoi/commit/2a7845f4ffe2fd427c140711c0d7d46424747363) feat: Add 1Password SDK template funcs - [`676a9a9`](https://togithub.com/twpayne/chezmoi/commit/676a9a97be823eba4b917621f79b2d50e4d4f1ea) feat: Add decompression of file externals ##### Fixes - [`2615c52`](https://togithub.com/twpayne/chezmoi/commit/2615c52a54098e1b7f2803a94cf697acc8823fe9) fix: keep initFuncs when using 'includeTemplate' in config - [`f6ecfdb`](https://togithub.com/twpayne/chezmoi/commit/f6ecfdb0e4c7cb59924d5870d7ece5e7711d1073) fix: Use scriptTempDir for modify\_ scripts ##### Documentation updates - [`711534a`](https://togithub.com/twpayne/chezmoi/commit/711534a51184bdefd2fd0c6c19ab2094b1511d27) docs: Add link to article </details> <details> <summary>weaveworks/eksctl (weaveworks/eksctl)</summary> ### [`v0.187.0`](https://togithub.com/eksctl-io/eksctl/releases/tag/v0.187.0): eksctl 0.187.0 [Compare Source](https://togithub.com/weaveworks/eksctl/compare/0.186.0...0.187.0) ### Release v0.187.0 #### 🐛 Bug Fixes - Restrict `VPC.SecurityGroup` egress rules validations to self-managed nodes ([#​7883](https://togithub.com/weaveworks/eksctl/issues/7883)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 4pm on thursday" in timezone America/Los_Angeles, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/scottames/dots). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MzEuNCIsInVwZGF0ZWRJblZlciI6IjM3LjQzMS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: scottames-github-bot[bot] <162828115+scottames-github-bot[bot]@users.noreply.github.com>
Hello,
This PR add merge --squash. A PR already exist #3130, but the author abandoned it, so I remake it.
I modified to fit most of the comment made except this one https://github.com/jesseduffield/lazygit/pull/3130/files#r1404808121. I didn't find an existing example and thus didn't know to modify the code to fit it to the new way of doing things.
There's still the choice box to commit or not to do as discussed #3130 (comment). I'll do it when I have time, I first need to read the code to see how it really works.
Also only english has been made for now.
go generate ./...
)docs/Config.md
) have been updated if necessary