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

Re-use commit message if the changeset only contains one commit (Praqma case 13782)

    XMLWordPrintable

Details

    Description

      If only a single commit was pushed, it shouldn't be squash merged and have its message replaced.
      Trello card

      Attachments

        Activity

          Ascending order - Click to sort in descending order
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Thierry Lacour
          Path:
          src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GetCommitCountFromBranchCallback.java
          src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java
          src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java
          src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/GetCommitCountFromBranchCallbackIT.java
          src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/SquashCommitStrategyIT.java
          src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestCommit.java
          src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestUtilsFactory.java
          src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/UniqueBranchGenerator.java
          http://jenkins-ci.org/commit/pretested-integration-plugin/9b6d14d13a44b848c756e5157fba4f3743b1b3fe
          Log:
          JENKINS-30603 Squash strategy now respects single commit messages.

          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Thierry Lacour Path: src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GetCommitCountFromBranchCallback.java src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/SquashCommitStrategy.java src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/GetCommitCountFromBranchCallbackIT.java src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/SquashCommitStrategyIT.java src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestCommit.java src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestUtilsFactory.java src/test/java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/UniqueBranchGenerator.java http://jenkins-ci.org/commit/pretested-integration-plugin/9b6d14d13a44b848c756e5157fba4f3743b1b3fe Log: JENKINS-30603 Squash strategy now respects single commit messages.
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Mads Nielsen
          Path:
          pom.xml
          http://jenkins-ci.org/commit/pretested-integration-plugin/49616c8aa75f82213811531decbb64d7819efef3
          Log:
          JENKINS-30603 Updated JavaNCSS for Multicatch in Java 1.7

          Compare: https://github.com/jenkinsci/pretested-integration-plugin/compare/e93ad80e393c...49616c8aa75f

          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Mads Nielsen Path: pom.xml http://jenkins-ci.org/commit/pretested-integration-plugin/49616c8aa75f82213811531decbb64d7819efef3 Log: JENKINS-30603 Updated JavaNCSS for Multicatch in Java 1.7 Compare: https://github.com/jenkinsci/pretested-integration-plugin/compare/e93ad80e393c...49616c8aa75f
          thi Thierry Lacour added a comment -

          Squash strategy now respects single commits.
          Released in 2.3.1

          thi Thierry Lacour added a comment - Squash strategy now respects single commits. Released in 2.3.1
          thi Thierry Lacour added a comment -

          Added documentation to the wiki as well

          thi Thierry Lacour added a comment - Added documentation to the wiki as well

          People

            thi Thierry Lacour
            thi Thierry Lacour
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: