0
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:06:38 +01:00
gitea/services/pull
Brecht Van Lommel d647e74502
Improve squash merge commit author and co-author with private emails (#22977)
When emails addresses are private, squash merges always use
`@noreply.localhost` for the author of the squash commit. And the author
is redundantly added as a co-author in the commit message.

Also without private mails, the redundant co-author is possible when
committing with a signature that's different than the user full name and
primary email.

Now try to find a commit by the same user in the list of commits, and
prefer the signature from that over one constructed from the account
settings.
2023-03-09 22:17:04 -05:00
..
check_test.go
check.go
comment.go
commit_status.go
edits.go
lfs.go
main_test.go
merge_merge.go
merge_prepare.go
merge_rebase.go
merge_squash.go Improve squash merge commit author and co-author with private emails (#22977) 2023-03-09 22:17:04 -05:00
merge_test.go
merge.go
patch_unmerged.go
patch.go
pull_test.go
pull.go Improve squash merge commit author and co-author with private emails (#22977) 2023-03-09 22:17:04 -05:00
review.go
temp_repo.go
update_rebase.go
update.go