File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -248,7 +248,10 @@ class PushTask {
248248 if ( numConsecutive > 2 ) {
249249 // 3 consecutive commits with different branch, probably the branch commits are over. Everything OK.
250250 return true ;
251- } else if ( ! wrongCommitCandidate ) {
251+
252+ // Don't treat a merge pull request commit as a wrong commit between right commits.
253+ // The current push could be a quick fix after a merge.
254+ } else if ( ! wrongCommitCandidate && message . indexOf ( 'Merge pull request' ) == - 1 ) {
252255 wrongCommitCandidate = {
253256 message : message ,
254257 issue : issue ,
Original file line number Diff line number Diff line change 1313// limitations under the License.
1414
1515const DevConfig = require ( './dev-config' ) ;
16- const DEFAULT_ISSUE_REGEX = '(MOBILE)[-_]([0-9]+)' ;
16+ const DEFAULT_ISSUE_REGEX = '^ (MOBILE)[-_]([0-9]+)' ;
1717
1818/**
1919 * Class with some utility functions.
You can’t perform that action at this time.
0 commit comments