• Icon: Bug Bug
    • Resolution: Fixed
    • Icon: High High
    • None
    • None
    • None
    • None

      Merge commit messages usually contain all commit messages from one branch. This includes the exact text from any Smart Commits included in the merge, causing all commands to be executed a second time.

      i understand JIRA 7.1 included an improvement where duplicate time entries are ignored, in an attempt to solve the problem of merge commits containing time entries, but the #comment's are still added every time and any status changes (#ready-for-test, ...) are also carried out. The comments are not very critical, worst thing that happens is that it appears someone else adds the same comment I added, a few days after me (when they merge my commits into another branch).

      The status changes are dangerous though: if a ticket has since been transitioned to another status which happens to allow transitions back to the Smart Commit's status, the ticket might suddenly be reopened without anyone noticing, and without any indication as to why.

      My suggestion: add an option for BitBucket Server to simply ignore merge commits when checking for Smart Commits.

            [BSERV-8775] Merges should be ignored as Smart Commits

            Owen made changes -
            Workflow Original: Stash Workflow - Restricted [ 1445301 ] New: JAC Bug Workflow v3 [ 3135494 ]
            Brent P made changes -
            Resolution New: Fixed [ 1 ]
            Status Original: Open [ 1 ] New: Closed [ 6 ]
            Owen made changes -
            Workflow Original: Stash Workflow [ 1400257 ] New: Stash Workflow - Restricted [ 1445301 ]
            Andrew S (Inactive) made changes -
            Remote Link New: This issue links to "devstatus › DevStatus - master - FECQ › bugfix-BSERV-8775-backport-fix-for-smart-commits (server-syd-bamboo)" [ 180586 ]
            Andrew S (Inactive) made changes -
            Remote Link New: This issue links to "devstatus › DevStatus CI - master › bugfix-BSERV-8775-backport-fix-for-smart-commits (server-syd-bamboo)" [ 180638 ]
            Adam Brokes made changes -
            Status Original: Needs Triage [ 10030 ] New: Open [ 1 ]
            Gene Taylor made changes -
            Remote Link New: This issue links to "devstatus › 1. DevStatus CI - DEV › BSERV-8775-fix-smart-commits-on-merges (jira-software-bamboo)" [ 177750 ]
            Gene Taylor made changes -
            Remote Link New: This issue links to "devstatus › 1. DevStatus CI - POM versions › BSERV-8775-fix-smart-commits-on-merges (jira-software-bamboo)" [ 177804 ]
            Gene Taylor made changes -
            Remote Link New: This issue links to "devstatus › DevStatus - master - FECQ › BSERV-8775-fix-smart-commits-on-merges (jira-software-bamboo)" [ 177803 ]
            Gene Taylor made changes -
            Remote Link New: This issue links to "Z_Lauren › CloneDevStatusDEV › BSERV-8775-fix-smart-commits-on-merges (jira-software-bamboo)" [ 177802 ]

              Unassigned Unassigned
              602f55ce-b5a5-4156-b296-86f3daf0eed9 Deleted Account (Inactive)
              Affected customers:
              1 This affects my team
              Watchers:
              13 Start watching this issue

                Created:
                Updated:
                Resolved: