• Type: Bug
• Resolution: Cannot Reproduce
• Priority: Minor
• Component/s: pretested-integration-plugin
• Labels:

  None
• Environment:

  pretested-integration-plugin-2.2.1

[JENKINS-27662] Double quotes in commit message results in merge failure (Praqma case 12871)

Collapse comment: Bue Petersen added a comment - 2015-03-30 07:45

Bue Petersen added a comment - 2015-03-30 07:45

This problem could also indirectly be reported as JENKINS-27309

Expand comment: Bue Petersen added a comment - 2015-03-30 07:45

Bue Petersen added a comment - 2015-03-30 07:45 This problem could also indirectly be reported as JENKINS-27309

Collapse comment: SCM/JIRA link daemon added a comment - 2015-04-06 08:24

SCM/JIRA link daemon added a comment - 2015-04-06 08:24

Code changed in jenkins
User: Bue Petersen
Path:
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/AccumulatedCommitStrategy.java
src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java
http://jenkins-ci.org/commit/pretested-integration-plugin/bba993008f51195ebf913d760d405d7b28aa5ad6
Log:
JENKINS-27690,JENKINS-27662,JENKINS-27697: checkstyle fixes

Fixed some checkstyle warnings to pass thressholds.

Expand comment: SCM/JIRA link daemon added a comment - 2015-04-06 08:24

SCM/JIRA link daemon added a comment - 2015-04-06 08:24 Code changed in jenkins User: Bue Petersen Path: src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/AccumulatedCommitStrategy.java src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java http://jenkins-ci.org/commit/pretested-integration-plugin/bba993008f51195ebf913d760d405d7b28aa5ad6 Log: JENKINS-27690 , JENKINS-27662 , JENKINS-27697 : checkstyle fixes Fixed some checkstyle warnings to pass thressholds.

Collapse comment: Bue Petersen added a comment - 2015-04-06 10:04

Bue Petersen added a comment - 2015-04-06 10:04

We have written some tests that shows that this should be a problem, and that the git merge may have failed because of some other merge problem.

That merge problem isn't really reported in a good way, and the error reporting from the plugin hides the real cause of merge problems in some cases. Thus we have created JENKINS-27690 to improve logging.

This issues will then be resolved, by now including tests that integrate commits with double quotes in one of the commit messages.

Expand comment: Bue Petersen added a comment - 2015-04-06 10:04

Bue Petersen added a comment - 2015-04-06 10:04 We have written some tests that shows that this should be a problem, and that the git merge may have failed because of some other merge problem. That merge problem isn't really reported in a good way, and the error reporting from the plugin hides the real cause of merge problems in some cases. Thus we have created JENKINS-27690 to improve logging. This issues will then be resolved, by now including tests that integrate commits with double quotes in one of the commit messages.