File 0720-Let-pre-push-hook-detect-when-it-needs-an-upgrade.patch of Package erlang

From fc1f0444e32b039194189af97fb3d5358a2b91e3 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 5 Jun 2019 19:13:47 +0200
Subject: [PATCH] Let pre-push hook detect when it needs an upgrade

after a master release.
---
 scripts/pre-push | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/scripts/pre-push b/scripts/pre-push
index 670f1c9796..56a4eb945e 100755
--- a/scripts/pre-push
+++ b/scripts/pre-push
@@ -118,12 +118,27 @@ then
 		fi
                 if [ $remote_ref != refs/heads/master -a "$MASTER_ONLY" ] && git merge-base --is-ancestor $MASTER_ONLY $local_sha
                 then
-		    echo "$0 says:"
-		    echo "***"
-		    echo "*** INVALID MERGE: Commit $MASTER_ONLY should not be reachable from '$branch'!!!!"
-                    echo "***                You have probably merged master into '$branch' by mistake"
-		    echo "***"
-		    exit 1
+		    THIS_SCRIPT=`git rev-parse --git-path hooks/pre-push`
+		    if git show master:scripts/pre-push | diff -q $THIS_SCRIPT - > /dev/null 2>&1
+		    then
+			echo "$0 says:"
+			echo "***"
+			echo "*** INVALID MERGE: Commit $MASTER_ONLY should not be reachable from '$branch'!!!!"
+			echo "***                You have probably merged master into '$branch' by mistake"
+			echo "***"
+			exit 1
+		    else
+			echo "$0 says:"
+			echo "***"
+			echo "*** The script '$THIS_SCRIPT' of this OTP repo needs updating."
+			echo "*** Do it by executing the following command:"
+			echo "***"
+			echo "***     git show master:scripts/pre-push > $THIS_SCRIPT"
+			echo "***"
+			echo "*** And then retry the push."
+			echo "***"
+			exit 1
+		    fi
                 fi
                 if [ ${remote_ref#refs/heads/maint-} != $remote_ref ] && git merge-base --is-ancestor refs/remotes/$remote/maint $local_sha
                 then
-- 
2.16.4