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 a linear_fake_merge option (defaulting to True) #139

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

cgwalters
Copy link

One of my projects (projectatomic/rpm-ostree) has a protected master
branch. I was rather horrified to realize that homu force-pushes to
master by default. Admittedly, I understand this is the only way to
make github think the PR was merged (as opposed to just closed).

But in my mind, that's a deficiency of github - it should have an API
to allow us to "close merged with this commit".

Anyways, add an option so that those who prefer closing-as-unmerged over force
pushing can do that today.

@cgwalters
Copy link
Author

Thinking about this a bit more, one thing we can do is change the title of the PR to say [merged] foo bar baz.

One of my projects (projectatomic/rpm-ostree) has a protected master
branch.  I was rather horrified to realize that homu force-pushes to
master by default.  Admittedly, I understand this is the only way to
make github think the PR was merged (as opposed to just closed).

But in my mind, that's a deficiency of github - it should have an API
to allow us to "close merged with this commit".

Anyways, add an option so that those who prefer closed over force
pushing can do that today.

We at least retitle the commit so that it's more clear it was merged.
@cgwalters cgwalters force-pushed the option-disable-linear-fake-merge branch from 324c907 to 93067ad Compare March 16, 2016 21:20
@cgwalters
Copy link
Author

Now updated to also retitle the commit with [merged]

@ashcrow
Copy link

ashcrow commented Mar 18, 2016

👍 looks good!

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

Successfully merging this pull request may close these issues.

2 participants