Add Squash merge #3566
Add Squash merge #3566
Conversation
fix typo fix checkout branch
add langage and menu pannel
fix: type and rename files add refresh remove current branch in squashFiles tooltip
|
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 |
| if checkedOutBranchName == refName { | ||
| return func() error { return errors.New(self.c.Tr.CantMergeBranchIntoItself) } | ||
| } |
There was a problem hiding this comment.
What Stefan suggested in the original PR was to use the DisableReason field exposed by the MenuItem type to inhibit the actions instead of throwing an error when they're invoked.
Do to this, you should move this check to the upper level (the SquashBranch function) and conditionally set the DisabledReason field in case checkedOutBranchName == refName. Also, consider that both those menu options are disabled for the same reason.
Co-authored-by: Federico <me@azraelsec.sh>
|
I have your suggestion which seems indeed better suited but there's a bug and I can't figure out if it's mine or not. The feature is always disabled even if the ShowErrorInPanel is set to false. Do you have any idea why ? |
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