Uploaded image for project: 'SR for Bitbucket - Development'
  1. SR for Bitbucket - Development
  2. SRBITB-176

Merged commits from a tag into a branch is rejected by the trusted commit authors hook

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Done
    • Priority: High
    • Resolution: Fixed
    • Affects Version/s: 4.3.8, 4.3.12
    • Fix Version/s: 4.3.15
    • Labels:
      None
    • Sprint:
      Sprint 27 - Ends Nov 18
    • Critical Points:
      0.9

      Description

      To reproduce:

      • Enable the trusted commit authors hook with "can only push own commits mode" selected
      • Login as another BBS user and create a branch from master
      • Commit to master as this user (change git config)
      • Create a tag from this branch
      • Delete this branch both locally and remotely
      • Login as another user
      • Note that this commit is not our own and that this commit only exists on that tag (check using git tag --contains <commit-hash> and git branch --contains <commit-hash>) (tag should be the only one that returns anything)
      • Merge the tag into master and push changes
      • Hook rejects push as the merged commit is from another user

      Simplest solution is to exclude these tags like we do with branches (this is to handle merges and rebases) as the commit already made it through the hook by the original committer.

        Attachments

          Activity

            People

            Assignee:
            amarkham Adam Markham
            Reporter:
            amarkham Adam Markham
            Votes:
            1 Vote for this issue
            Watchers:
            2 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved: