Skip to content

Fix duplicate co-author in squashed merge commit messages#33020

Merged
lunny merged 6 commits into
go-gitea:mainfrom
hiifong:merge/commit-message
Dec 30, 2024
Merged

Fix duplicate co-author in squashed merge commit messages#33020
lunny merged 6 commits into
go-gitea:mainfrom
hiifong:merge/commit-message

Conversation

@hiifong

@hiifong hiifong commented Dec 28, 2024

Copy link
Copy Markdown
Member

Fix: #31980

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 28, 2024
@wxiaoguang

Copy link
Copy Markdown
Contributor

The function you removed was done intentionally: Improve squash merge commit author and co-author with private emails (#22977)

I think you need to write some tests to clarify the logic.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 30, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 30, 2024
@wxiaoguang wxiaoguang marked this pull request as ready for review December 30, 2024 07:55
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 30, 2024
@lunny lunny enabled auto-merge (squash) December 30, 2024 18:38
@lunny lunny merged commit a871688 into go-gitea:main Dec 30, 2024
@GiteaBot GiteaBot added this to the 1.24.0 milestone Dec 30, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 30, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Dec 30, 2024
…3020)

Fix: go-gitea#31980

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Dec 30, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 31, 2024
* giteaofficial/main:
  Fix issue comment number (go-gitea#30556)
  Fix duplicate co-author in squashed merge commit messages (go-gitea#33020)
  Merge updatecommentattachment functions (go-gitea#33044)
  Move SetMerged to service layer (go-gitea#33045)
  Remove aws go sdk package dependency (go-gitea#33029)
  Fix settings not being loaded at CLI (go-gitea#26402)
  Refactor fixture loading for testing (go-gitea#33024)
  Use gitrepo.GetTreePathLatestCommit to get file lastest commit instead from latest commit cache (go-gitea#32987)
  Fix bug automerge cannot be chosed when there is only 1 merge style (go-gitea#33040)
  use `-s -w` ldflags for release artifacts (go-gitea#33041)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Mar 31, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Squash in PR with co-authored

4 participants