From d8d5631ed89b645e2bce50203a877ef5b5ab4fab Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Tue, 7 Jan 2020 22:10:39 +0100
Subject: [merge script] Never bypass outdated branch sanity check.

The message was confusing and the prompt let one reviewer think the
merge script would take care of doing the pull, which it doesn't.
---
 dev/tools/merge-pr.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dev/tools')

diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh
index c0a3eeb11c..a888998ebf 100755
--- a/dev/tools/merge-pr.sh
+++ b/dev/tools/merge-pr.sh
@@ -137,7 +137,8 @@ if [ "$LOCAL_BRANCH_COMMIT" != "$UPSTREAM_COMMIT" ]; then
     else
         error "Local branch is not up-to-date with ${REMOTE}."
         error "Pull before merging."
-        ask_confirmation
+        # This check should never be bypassed.
+        exit 1
     fi
 fi
 
-- 
cgit v1.2.3