From 9de15f243bbfbfda65fe22f6f14ea5ad32270f4b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 10 Sep 2020 12:27:22 +0200
Subject: [PATCH] MOBILE-3501 gulp: Fix HEAD commit calculation

---
 gulp/task-push.js | 5 ++++-
 gulp/utils.js     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gulp/task-push.js b/gulp/task-push.js
index 9bbf61340..54d151dde 100644
--- a/gulp/task-push.js
+++ b/gulp/task-push.js
@@ -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,
diff --git a/gulp/utils.js b/gulp/utils.js
index db4a66413..0ca11fa74 100644
--- a/gulp/utils.js
+++ b/gulp/utils.js
@@ -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.