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

Do not push to source repository if there was no change #112

Closed
wants to merge 2 commits into from

Conversation

Jellby
Copy link

@Jellby Jellby commented Jun 4, 2018

In the simplest case where the MR can be immediately merged, there's no need for Marge to push to the source repository. In the case of a MR originating from a fork, Marge could have no permission to push, and then the merge fails for no good reason.

Proper handling of MRs from forks will come in a different PR (#113), but this looks like a harmless change that could be accepted right away.

@Jellby Jellby changed the title Do not push to repository if there was no change Do not push to source repository if there was no change Jul 3, 2018
@aschmolck
Copy link
Contributor

I don't think adding extra logic to special case this is a good idea, because now rather than sorting out your permissions you have a situation where sometimes things fail after they appeared to work fine before.

I'd much rather keep it so that if you want to use marge, it needs to be able to push to your branch.

@aschmolck aschmolck closed this Jul 19, 2018
@Jellby
Copy link
Author

Jellby commented Jul 19, 2018

With the merge strategy there's no need to push to source branches (for reasons to use the merge strategy, see #104 (comment)). Would it be acceptable if the check is done on the merge strategy instead?

@Jellby
Copy link
Author

Jellby commented Jul 23, 2018

@aschmolck With the merge strategy there's no reason for marge to push to other branches. Would it be acceptable to skip the push when using the merge strategy?

Even with the rebase strategy I don't see a problem with pushing only when necessary. If marge has no permission to push and it's not needed, the merge can proceed anyway. If a push is needed, she will leave a message. Is that worse than leaving a message and failing no matter what, even if no push is needed?

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