Skip to content

Add merge by squash option #380

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
May 29, 2016
Merged

Add merge by squash option #380

merged 1 commit into from
May 29, 2016
+13 −5

Conversation

@soullivaneuh
Copy link
Contributor

@soullivaneuh soullivaneuh commented May 28, 2016

@soullivaneuh soullivaneuh mentioned this pull request May 28, 2016
Merged
7 tasks
GrahamCampbell
GrahamCampbell reviewed May 28, 2016
View reviewed changes
lib/Github/Api/PullRequest.php
$params = array(
'commit_message' => $message,
'sha' => $sha,
'squash' => $squash,
Copy link
Contributor

@GrahamCampbell GrahamCampbell May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this break if not using the preview API?

Copy link
Contributor

@GrahamCampbell GrahamCampbell May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or does GitHub ignore the invalid extra field?

Copy link
Contributor Author

@soullivaneuh soullivaneuh May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you don't use the preview API, GitHub will just make a classic merge. 👍

Copy link
Contributor

@GrahamCampbell GrahamCampbell May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be safer to only pass through squash if it's set to true, otherwise omit it, wouldn't it?

Copy link
Contributor Author

@soullivaneuh soullivaneuh May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would change nothing. If the parameter is not managed by GitHub API v3, it is simply ignored.

@soullivaneuh
Copy link
Contributor Author

soullivaneuh commented May 29, 2016

@cursedcoder I fixed the tests. 👍

@cursedcoder cursedcoder merged commit fe91371 into KnpLabs:master May 29, 2016
@soullivaneuh soullivaneuh deleted the patch-3 branch May 29, 2016 17:07
@soullivaneuh
Copy link
Contributor Author

soullivaneuh commented May 29, 2016

Thanks! Any ETA for the 1.7? 😄

@GrahamCampbell
Copy link
Contributor

GrahamCampbell commented Jun 5, 2016

Does this actually work for you? I can't get it to work for me. Yes, I am using the application/vnd.github.polaris-preview+json accept. :)

@soullivaneuh
Copy link
Contributor Author

soullivaneuh commented Jun 6, 2016

@GrahamCampbell Yes.

See my GitHub client init: https://github.com/sonata-project/dev-kit/blob/87f5a3cf59ab9f9b5dabdb95f5eac5b6574641f4/src/Console/Command/AbstractCommand.php#L88-L95

And the merge call: https://github.com/sonata-project/dev-kit/blob/87f5a3cf59ab9f9b5dabdb95f5eac5b6574641f4/src/Console/Command/PullRequestAutoMergeCommand.php#L121-L129

@GrahamCampbell
Copy link
Contributor

GrahamCampbell commented Jun 6, 2016

nvm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@soullivaneuh @GrahamCampbell @cursedcoder