Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-27662

Double quotes in commit message results in merge failure (Praqma case 12871)

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Cannot Reproduce
    • Icon: Minor Minor
    • pretested-integration-plugin
    • None
    • pretested-integration-plugin-2.2.1

      Merge fails when commit message has "" double quotes.

      Work around:

      Modify commits messages and push again.

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

          Bue Petersen created issue -

          Bue Petersen added a comment -

          This problem could also indirectly be reported as JENKINS-27309

          Bue Petersen added a comment - This problem could also indirectly be reported as JENKINS-27309
          Bue Petersen made changes -
          Summary Original: Double quotes in commit message results in merge failure New: Double quotes in commit message results in merge failure (Praqma case 12871)
          Bue Petersen made changes -
          Status Original: Open [ 1 ] New: In Progress [ 3 ]

          SCM/JIRA link daemon added a comment -

          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.

          SCM/JIRA link daemon added a comment - 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.
          Bue Petersen made changes -
          Status Original: In Progress [ 3 ] New: Open [ 1 ]

          Bue Petersen added a comment -

          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.

          Bue Petersen added a comment - 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.
          Bue Petersen made changes -
          Resolution New: Fixed [ 1 ]
          Status Original: Open [ 1 ] New: Resolved [ 5 ]
          Bue Petersen made changes -
          Resolution Original: Fixed [ 1 ]
          Status Original: Resolved [ 5 ] New: Reopened [ 4 ]
          Bue Petersen made changes -
          Resolution New: Cannot Reproduce [ 5 ]
          Status Original: Reopened [ 4 ] New: Resolved [ 5 ]

            bue Bue Petersen
            bue Bue Petersen
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved: