mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-11 08:06:25 -04:00
cd50c79ae4
There are two possible fixes for this bug, and they differ in behavior when rewording a commit. The one I chose here always splits at the first line feed, which means that for an improperly formatted commit message such as this one: This is a very long multi-line subject, which you shouldn't really use in git. And this is the body (we call it "description" in lazygit). we split after the first line instead of after the first paragraph. This is arguably not what the original author meant, but splitting after the first paragraph doesn't really work well in lazygit, because we would try to put both lines into the one-line subject field of the message panel, and you'd only see the second and not even know that there are more. The other potential fix would have been to join subject and description with two line feeds instead of one in JoinCommitMessageAndDescription; this would have fixed our bug in the same way, but would result in splitting the above message after the second line instead of the first. I think that's worse, so I decided for the first fix. While we're at it, simplify the code a little bit; strings.Cut is documented to return (s, "") when the separator is not found, so there's no need to do this on our side. We do have to trim spaces on the description now, to support the regular reword case where subject and body are separated by a blank line. |
||
|---|---|---|
| .. | ||
| bisect | ||
| branch | ||
| cherry_pick | ||
| commit | ||
| config | ||
| conflicts | ||
| custom_commands | ||
| demo | ||
| diff | ||
| file | ||
| filter_and_search | ||
| filter_by_path | ||
| interactive_rebase | ||
| misc | ||
| patch_building | ||
| reflog | ||
| shared | ||
| staging | ||
| stash | ||
| submodule | ||
| sync | ||
| tag | ||
| ui | ||
| undo | ||
| worktree | ||
| test_list.go | ||
| test_list_generator.go | ||
| tests.go | ||