-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Duplicate headlines in commit message after pull merge #12365
Comments
The message shown in the snapshot is a merge-by-squash pull. It seems that the current behavior makes sense under most circumstances like when the PR has a title independent of the individual commits. Probably manually removing the repeated lines is the best way one can do? If there is any good idea to improve, I can give it a look. |
GitHub also has this issue. It may actually be a side effect of git squashing, not sure. |
@silverwind hmm, if Github has the same issue and no one complains about it, it’s probably good enough for most people. Let me see if there is any possible improvement. |
Tbh I've been thinking about this and I think the way GitHub and Gitea do this is incorrect. We really should be offering the content of the PRs headline comment as the commit comment instead of the git commits. The PR headline is the description of what this PR does - therefore it's what the squash commit should have as its comment. |
This issue has been automatically marked as stale because it has not had recent activity. I am here to help clear issues left open even if solved or waiting for more insight. This issue will be closed if no further activity occurs during the next 2 weeks. If the issue is still valid just add a comment to keep it alive. Thank you for your contributions. |
Originally, it was filled by the commit messages of the involved commits. In this change, we use the headline comment of the pull request as the commit message when it is a squash merge. Thanks to @zeripath for suggesting the idea. Fixes go-gitea#12365
Originally, it was filled by the commit messages of the involved commits. In this change, we use the headline comment of the pull request as the commit message when it is a squash merge. Thanks to @zeripath for suggesting the idea. Fixes #12365 Co-authored-by: Mura Li <typeless@users.noreply.github.com>
Gitea version (or commit ref):
1.13.0+dev-258-g8f489131f
Git version:
2.26.2
Operating system:
x86_64 GNU/Linux synology_avoton_1817+
Database (use
[x]
):Can you reproduce the bug at https://try.gitea.io:
Log gist:
Description
As you can see, the headline
Upgrade mtd-utils to 2.1.2 for UBIFS authentication
is repeated.It's okay to remove it manually. But the UX would be nicer if no such step is required.
...
The text was updated successfully, but these errors were encountered: