MOBILE-3501 gulp: Fix HEAD commit calculation
parent
e6ac209756
commit
9de15f243b
|
@ -248,7 +248,10 @@ class PushTask {
|
|||
if (numConsecutive > 2) {
|
||||
// 3 consecutive commits with different branch, probably the branch commits are over. Everything OK.
|
||||
return true;
|
||||
} else if (!wrongCommitCandidate) {
|
||||
|
||||
// Don't treat a merge pull request commit as a wrong commit between right commits.
|
||||
// The current push could be a quick fix after a merge.
|
||||
} else if (!wrongCommitCandidate && message.indexOf('Merge pull request') == -1) {
|
||||
wrongCommitCandidate = {
|
||||
message: message,
|
||||
issue: issue,
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
// limitations under the License.
|
||||
|
||||
const DevConfig = require('./dev-config');
|
||||
const DEFAULT_ISSUE_REGEX = '(MOBILE)[-_]([0-9]+)';
|
||||
const DEFAULT_ISSUE_REGEX = '^(MOBILE)[-_]([0-9]+)';
|
||||
|
||||
/**
|
||||
* Class with some utility functions.
|
||||
|
|
Loading…
Reference in New Issue