mirror of
1
Fork 0
forgejo/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.go Add force_merge to merge request and fix checking mergable (#23010) 2023-02-21 08:42:07 -06:00
check_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
comment.go Fix pull request update showing too many commits with multiple branches (#22856) 2023-03-09 12:14:22 -06:00
commit_status.go Supports wildcard protected branch (#20825) 2023-01-16 16:00:22 +08:00
edits.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
lfs.go Refactor and tidy-up the merge/update branch code (#22568) 2023-03-07 15:07:35 -05:00
main_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
merge.go Refactor merge/update git command calls (#23366) 2023-03-09 09:48:52 -06:00
merge_merge.go Refactor and tidy-up the merge/update branch code (#22568) 2023-03-07 15:07:35 -05:00
merge_prepare.go Refactor merge/update git command calls (#23366) 2023-03-09 09:48:52 -06:00
merge_rebase.go Refactor and tidy-up the merge/update branch code (#22568) 2023-03-07 15:07:35 -05:00
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 Support template for merge message description (#22248) 2022-12-29 14:40:20 +02:00
patch.go Refactor and tidy-up the merge/update branch code (#22568) 2023-03-07 15:07:35 -05:00
patch_unmerged.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
pull.go Improve squash merge commit author and co-author with private emails (#22977) 2023-03-09 22:17:04 -05:00
pull_test.go Support template for merge message description (#22248) 2022-12-29 14:40:20 +02:00
review.go Make Ctrl+Enter submit a pending comment (starting review) instead of submitting a single comment (#23245) 2023-03-04 02:13:37 -05:00
temp_repo.go Refactor and tidy-up the merge/update branch code (#22568) 2023-03-07 15:07:35 -05:00
update.go Refactor and tidy-up the merge/update branch code (#22568) 2023-03-07 15:07:35 -05:00
update_rebase.go Refactor and tidy-up the merge/update branch code (#22568) 2023-03-07 15:07:35 -05:00