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

[JENKINS-30486] Added --no-commit option to MergeCommand #185

Merged
merged 1 commit into from Sep 30, 2015

Conversation

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

praqma-thi commented Sep 21, 2015

Background

We are planning to use the Credentials API in our Pretested Integration plugin, but we're lacking certain features in the Git Client plugin. The ability to merge without committing being one of them.
Related issue: JENKINS-30486

Implementation

The MergeCommand interface now requires a setCommit(boolean commit) implementation which both JGitAPIImpl and CliGitAPIImpl received. Commit defaults to true as to not change the plugin's default behaviour.

Testing

Two test cases were added to GitAPITestCase to test both a committed and non-commited merge. We also tested our own plugin, using the no-commit option, and all our tests pass as well.

@jenkinsadmin

This comment has been minimized.

Copy link
Member

jenkinsadmin commented Sep 21, 2015

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

MarkEWaite added a commit that referenced this pull request Sep 30, 2015

Merge pull request #185 from praqma-thi/JENKINS-30486
[JENKINS-30486] Added --no-commit option to MergeCommand

@MarkEWaite MarkEWaite merged commit e39f751 into jenkinsci:master Sep 30, 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