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.

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

Backport workflow: maintain authorship #10676

Open
nicoddemus opened this issue Jan 19, 2023 · 1 comment
Open

Backport workflow: maintain authorship #10676

nicoddemus opened this issue Jan 19, 2023 · 1 comment
Labels
type: infrastructure improvement to development/releases/CI structure

Comments

@nicoddemus
Copy link
Member

Maintain commit authorship when creating the backport PR.

@nicoddemus nicoddemus added the type: infrastructure improvement to development/releases/CI structure label Jan 19, 2023
@nicoddemus nicoddemus changed the title Backport workflow Backport workflow: maintain authorship Jan 19, 2023
@antonblr
Copy link
Member

I believe it will be fine if we limit the PR merge actions to "Squash and Merge" button only.

e.g. these PRs merge commit authorship got overridden by the mergers (I assume "Create a merge commit" button was used):

these are fine - the merge commit author preserved, even it was merged by another person:

The following line gets the commit sha of the merged PR for backporting and depends on merge type the author will be the one who fixed the issue, or the one who merged the PR:

git cherry-pick -x --mainline 1 ${{ github.event.pull_request.merge_commit_sha }}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: infrastructure improvement to development/releases/CI structure
Projects
None yet
Development

No branches or pull requests

2 participants