Add co-authors of a pull request when squash-merging

[kolaente]

Currently, Gitea does not add any co-authors to the commit message if there was more than one author in a pull request and the pull request is squash-merged.

I would propose to append a message like the following to the commit message text box when merging:

Co-authored-by: User <[email protected]>

This makes it easier to see with only a git blame later who participated code in that pull request.

[shilch]

It's a common standard for commit message trailers. Here's a list of trailers as a reference.

[shilch]

And this is GitHub doing it.

[guillep2k]

Interesting. We could add Acked-by: for approvers.

[zeripath]

Agreed! I wanted to add this to the signing code but realised that it was out of scope.

It does need us to consider if we're squashing if we're going to add the co authors of co authored commits we're squashing too. This means we will likely need to semi parse the commit message...

[guillep2k]

It does need us to consider if we're squashing if we're going to add the co authors of co authored commits we're squashing too. This means we will likely need to semi parse the commit message...

Interesting. Maybe a two-step feature?

[zeripath]

This is partially fixed by #9393 - A more complete implementation would do the following:

• Parse the commit messages and find their Co-Authored-By trailers to add those
• Would skip merges with the base branch and commits that are already in base branch

I if we get both of those would mean that we might have better functionality than GH

[stale]

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.

[stale]

This issue has been automatically closed because of inactivity. You can re-open it if needed.

[MarcelCoding]

Is it intended that this is always added, even If the email is the same as the actual committer email?

marcel@marcel:~/stack$ git log
commit 9a0fb7f3f710673ae391bf3d881e53fdfec06577 (HEAD -> main, origin/main, origin/HEAD)
Author: Renovate Bot <[email protected]>
Date:   Tue Aug 9 00:55:37 2022 +0200

    Configure Renovate (#3)

    Reviewed-on: https://git.m4rc3l.de/marcel/stack/pulls/3
    Co-authored-by: Renovate Bot <[email protected]>
    Co-committed-by: Renovate Bot <[email protected]>

[Basitx72]

Co-authored-by: Maverick920 [email protected]

[Preetiraj3697]

Co-authored-by: Preetiraj3697 [email protected]

[ares-dev05]

Co-authored-by: ares9515 [email protected]