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

Ability to configure changelog message truncation and inclusion of merge commits

    • Icon: New Feature New Feature
    • Resolution: Unresolved
    • Icon: Minor Minor
    • git-plugin

      I have a need for the ability to:

      1. Include merge commits in the changelog
      2. Prevent truncation of commits in the changelog (see also JENKINS-29977 where someone else has the requirement)

      The reason for this is that I want to have the following workflow:

      • In JIRA create a new feature branch for an issue (the branch name automatically references the issue ID)
      • Add code to the branch
      • Create pull request for the branch
      • Merge the branch
      • Build on Jenkins
      • Jenkins parses the issue IDs from the feature branch names in the merge commit messages, and updates the issues (with the jira-plugin)

      The problem is that the Git plugins exclude merge commits, and truncate the commit messages before the issue ID features in them.

      I have forks that implement this feature, and I would like to know if it is worth tidying them up and writing the tests then submitting a PR, or whether my approach in general is not acceptable.
      https://github.com/sfhardman/git-plugin/commit/75c735351032626743cfca28fd8a0902ed7e0b3c
      https://github.com/sfhardman/git-client-plugin/commit/6de5518f27d735a3d9b02608cda1dd689c925b12

      Thanks

          [JENKINS-32320] Ability to configure changelog message truncation and inclusion of merge commits

          Henrik H added a comment -

          Hello,
          this feature would be very interesting for us. Maybe separating the two features and providing a pull request for each would be more likely to be accepted.

          Henrik H added a comment - Hello, this feature would be very interesting for us. Maybe separating the two features and providing a pull request for each would be more likely to be accepted.

          Simon Hardman added a comment -

          Hi Henrik

          Unfortunately we've moved to using Pipeline builds and our use case is easy enough to manage with groovy and shell scripts so we no longer have a use for the changes. If you want to run with them you are most welcome.

          Simon Hardman added a comment - Hi Henrik Unfortunately we've moved to using Pipeline builds and our use case is easy enough to manage with groovy and shell scripts so we no longer have a use for the changes. If you want to run with them you are most welcome.

          Mark Waite added a comment - - edited

          Changelog message summary truncation control has been added to git plugin 4.0.0 as the fix for JENKINS-29977. No release date for git plugin 4.0.0 yet, but builds are available now if you'd like to test them.

          Install:

          Mark Waite added a comment - - edited Changelog message summary truncation control has been added to git plugin 4.0.0 as the fix for JENKINS-29977 . No release date for git plugin 4.0.0 yet, but builds are available now if you'd like to test them. Install: git client plugin 3.0.0 pre-release build git plugin 4.0.0 pre-release build

            Unassigned Unassigned
            sfhardma Simon Hardman
            Votes:
            4 Vote for this issue
            Watchers:
            7 Start watching this issue

              Created:
              Updated: