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

Implemented Squash option on MergeCommand. JENKINS-28833 #169

Merged
merged 2 commits into from Jun 19, 2015

Conversation

Projects
None yet
3 participants
@praqma-thi
Copy link
Contributor

praqma-thi commented Jun 18, 2015

Background

We are looking to use the Credentials API in our pretested-integration-plugin. However, before we can get started on that, we'll need to add some missing functionalities to the git-client-plugin. The ability to squash commits when merging being one of them. (Related issue: JENKINS-28833)

Implementation

The implementation was pretty straightforward. MergeCommand now requires a setSquash(boolean squash) implementation which both JGitAPIImpl and CliGitAPIImpl received.

Testing

Tests were written to test both a squashed and unsquashed merge. We also took it for a spin with our own plugin and all its tests pass using the new squash merge.

@jenkinsadmin

This comment has been minimized.

Copy link
Member

jenkinsadmin commented Jun 18, 2015

Thank you for a pull request! Please check this document for how the Jenkins project handles pull requests

@MarkEWaite

This comment has been minimized.

Copy link
Contributor

MarkEWaite commented Jun 18, 2015

I ran this pull request through my test environments successfully (Windows 7, Windows 8.1, Debian 6, Debian 7, Debian 8, CentOS 6, CentOS 7). I reviewed the code as well, and it looks good to me.

@ndeloof, any reason this should not be merged to the master branch?

MarkEWaite added a commit that referenced this pull request Jun 19, 2015

Merge pull request #169 from Praqma/JENKINS-28833
Implemented Squash option on MergeCommand. JENKINS-28833

@MarkEWaite MarkEWaite merged commit f4d2340 into jenkinsci:master Jun 19, 2015

1 check passed

Jenkins This pull request looks good
Details

@bicschneider bicschneider referenced this pull request Jul 1, 2016

Closed

Dead links on website #28

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