- changed status to resolved
Control Freak picks up incorrect commits when checking for existence of JIRA
In our organization, the standard development process is for developers to use feature branches to commit changes as regularly as feasible. If additional changes are required and their feature branch is out of date, developers are meant to rebase on top of the destination branch, and force push the feature branch.
Once the developer has performed a rebase, when force pushing the feature branch, control freak is identifying new commits as deltas between the local branch and the remote feature branch. This picks up commits that were not introduced by the developer but were included after the rebase. Some of the JIRA tasks linked to those commits may have already been closed, so if the control freak plugin is configured to check the status of JIRA, it rejects the push due these commits. To work around this, developers have to delete their remote feature branch but this closes any open pull request which causes the developers to lose any existing pull request discussions.
Is it possible to enhance Control Freak to perform the delta check between the local feature branch and the HEAD of the destination branch instead?
Comments (1)
-
repo owner - Log in to comment
The rebase-awareness introduced in v2020.09.14 should fix this.