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
[JENKINS-30486] Added --no-commit option to MergeCommand #185
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.
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.
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.