Avoid duplicate commit messages on squashing commit

[ansidev]

Is your feature request related to a problem? Please describe.

A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

I have two commits A and B that have the same commit message, e.g. "commit message"
I want to squash these commits.
The final commit message will be:

commit message
commit message

Describe the solution you'd like

A clear and concise description of what you want to happen.

The final commit message should be:

commit message

If there are more than three commit messages, we should remove duplicate commit messages. For instance:

Input:

commit message 1
commit message 2
commit message 1

Expected output:

commit message 1
commit message 2

Describe alternatives you've considered

A clear and concise description of any alternative solutions or features you've considered.

Additional context

Add any other context or screenshots about the feature request here.

[mark2185]

Why do you have several commits with the same message? If they're meant to be squashed at some point right from the start, better to use git commit --fixup then.

Stage the changes you want, go to the Commits panel, highlight the commit you want to amend and use F to create a fixup commit which you can later squash through an interactive rebase (there's an S mapping that applies all the fixup commits in the Commits panel).

[stefanhaller]

I also recommend the workflow Luka describes, but I think this topic deserves some more explanation.

Lazygit (like git) has two different commands for squashing commits: "squash" and "fixup".

• "squash" (s keybinding) is for when you want to combine both commit messages into one somehow. If you do this in git (by doing an interactive rebase and using the squash command in the rebase-todo file) it will open a commit message editor with the concatenation of both messages, so that you can craft the final message right at that point. Since lazygit doesn't have an easy way to put up the commit message editor at that point (see Allow rewording in interactive rebase #2536 for some discussion about that), the best we can do in that case is to concatenate all messages, and let the user press r afterwards to craft their final commit message. Given this limitation, I think s is not a very useful command in lazygit.
• "fixup" (f keybinding) is for when you want to squash a commit and discard its commit message, keeping only the one of the commit you squashed into. That's exactly the same as using the fixup command in an interactive rebase in git. I use this much more often than s myself, and in your first example above it sounds like you should have just used it there, too.

[ansidev]

My bad. Good to know fixup.