Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 6 commits into from
Dec 30, 2024
Merged

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

merged 6 commits into from
Dec 30, 2024

Conversation

hiifong
Copy link
Member

@hiifong hiifong commented Dec 28, 2024 •
edited
Loading

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
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 28, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Dec 28, 2024
@hiifong hiifong mentioned this pull request Dec 28, 2024
Closed
@wxiaoguang
Copy link
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.

@wxiaoguang wxiaoguang mentioned this pull request Dec 28, 2024
Merged
@hiifong hiifong marked this pull request as draft December 28, 2024 09:27
@pull-request-size pull-request-size bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 28, 2024
@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
@lunny lunny added the backport/v1.23 This PR should be backported to Gitea 1.23 label 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
26 checks passed
@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
@hiifong @wxiaoguang @GiteaBot
Fix duplicate co-author in squashed merge commit messages (go-gitea#3…
3e7bd95 
…3020)

Fix: go-gitea#31980

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@GiteaBot GiteaBot mentioned this pull request Dec 30, 2024
Merged
@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
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
8aaec8e 
* 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)
lunny pushed a commit that referenced this pull request Dec 31, 2024
@GiteaBot
Fix duplicate co-author in squashed merge commit messages (#33020) (#…
96fff86 
…33054)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.23 This PR should be backported to Gitea 1.23 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.24.0
Development

Successfully merging this pull request may close these issues.

Squash in PR with co-authored
4 participants
@hiifong @wxiaoguang @lunny @GiteaBot