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

add an action for fast-forward merge #127

Open
lsf37 opened this issue Jul 21, 2021 · 4 comments
Open

add an action for fast-forward merge #127

lsf37 opened this issue Jul 21, 2021 · 4 comments
Labels
enhancement New feature or request

Comments

@lsf37
Copy link
Member

lsf37 commented Jul 21, 2021

Or possibly a github-app, but it should be possible to do in a pull_request_target action. Might just be a bit slow, and show up in the status checks even when not running.

Requirements:

  • only people with write access to the repo should be able to trigger an actual merge
  • should only merge when all required checks have passed
  • abort when there is no clean ff merge

Why?

  • preserves gpg-signed commits and commit hashes
@lsf37 lsf37 added the enhancement New feature or request label Jul 21, 2021
@kent-mcleod
Copy link
Member

Did GitHub used to support fast-forward merging and then remove it?

@lsf37
Copy link
Member Author

lsf37 commented Sep 26, 2021

There used to be a GitHub app at least that supported it, but it is no longer maintained. I don't remember if GitHub itself had a ff-merge button, but I don't think so.

@kent-mcleod
Copy link
Member

Right. I guess we just simulated it with ff-merge on bitbucket which then pushed to github. And I guess GitHub doesn't allow it because they want to record who the committer was.

@lsf37
Copy link
Member Author

lsf37 commented Mar 8, 2023

Just logging an observation here: manual fast-forward merge on the command line still works fine, even with PR review and test requirements:

git checkout master
git pull
git merge --ff-only <my-pr-branch>
git push

does work fine if you have sufficient rights to merge the pull request and if the required conditions for merging the PR are achieved. This makes it possible for instance to use gpg-signed commits (without GitHub invalidating the signature on rebase merges).

It'd still be nice if there was an UI thing that did that for us.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

2 participants