Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Implemented Squash option on MergeCommand. JENKINS-28833 #169
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)
The implementation was pretty straightforward.
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.
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?