Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-6980

Add option for not including individual commit messages in pull request merge commit messages

XMLWordPrintable

    • We collect Bitbucket feedback from various sources, and we evaluate what we've collected when planning our product roadmap. To understand how this piece of feedback will be reviewed, see our Implementation of New Features Policy.

      Currently when you merge a pull request in Stash, the resulting commit message for the merge includes the messages from all the individual commits being merged. This causes us problems because we use Crucible to generate release reports, and merging from our release branch into develop (for hot fixes added to release after cutting the branch off develop) causes JIRAs from previous releases to be included in the report for the next release.

      It would be great to have an option to NOT include the individual commit messages in the merge commit.

        1. image-2019-09-05-14-14-58-164.png
          image-2019-09-05-14-14-58-164.png
          22 kB

            [BSERV-6980] Add option for not including individual commit messages in pull request merge commit messages

            Bryan Turner (Inactive) added a comment - - edited

            Bitbucket Server 6.7.0 adds a new "Commit summaries" setting to the "Merge strategies" tab, at both project and repository level, which allows configuring the number of summaries appended to the user-supplied message when a pull request is merged.

            The value defaults to 20, which matches the existing functionality, but it can be configured to 0 to completely omit --log details when merging or squashing a pull request. (Note that "ff-only" and "rebase + merge -ff-only" strategies don't use user-provided commit messages at all, so they already didn't, and still don't, append --log output regardless of this new setting.) The setting cannot be overridden at merge time. Administrators (project, repository or global) can configure the value they want to be used, and it will be used for all pull requests merged from that point forward.

            Note that when a value is configured at project level, if any repositories inside that project are configured to use custom settings rather than inheriting their settings, whatever commit summary count is configured for the repository will override whatever value was set at the project level. (This is the same handling that's applied to the enabled merge strategies; the most specific configuration is the configuration that gets used.)

            Best regards,
            Bryan Turner
            Atlassian Bitbucket

            Bryan Turner (Inactive) added a comment - - edited Bitbucket Server 6.7.0 adds a new "Commit summaries" setting to the "Merge strategies" tab, at both project and repository level, which allows configuring the number of summaries appended to the user-supplied message when a pull request is merged. The value defaults to 20, which matches the existing functionality, but it can be configured to 0 to completely omit --log details when merging or squashing a pull request. (Note that "ff-only" and "rebase + merge -ff-only" strategies don't use user-provided commit messages at all, so they already didn't, and still don't, append --log output regardless of this new setting.) The setting cannot be overridden at merge time. Administrators (project, repository or global) can configure the value they want to be used, and it will be used for all pull requests merged from that point forward. Note that when a value is configured at project level, if any repositories inside that project are configured to use custom settings rather than inheriting their settings, whatever commit summary count is configured for the repository will override whatever value was set at the project level. (This is the same handling that's applied to the enabled merge strategies; the most specific configuration is the configuration that gets used.) Best regards, Bryan Turner Atlassian Bitbucket

            Andrew Hammond added a comment -

            I would like to see this option provided on the Settings->Workflow->Pull requests screen.. defaulted to off.

            Perhaps the merge message concatenation should be removed entirely. Or the crucible reports made smart enough to exclude JIRA's referenced in merge commits.

            Andrew Hammond added a comment - I would like to see this option provided on the Settings->Workflow->Pull requests screen.. defaulted to off. Perhaps the merge message concatenation should be removed entirely. Or the crucible reports made smart enough to exclude JIRA's referenced in merge commits.

              Unassigned Unassigned
              b43a6fa40666 David Blundell
              Votes:
              9 Vote for this issue
              Watchers:
              7 Start watching this issue

                Created:
                Updated:
                Resolved: