From 3575dd8e8c7edaa904220e5f59240b91814b5564 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 25 Oct 2018 21:57:53 -0700 Subject: [PATCH] * admin/automerge: Abort if NEWS gets modified. --- admin/automerge | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/admin/automerge b/admin/automerge index e88711f8d6d..b320369d174 100755 --- a/admin/automerge +++ b/admin/automerge @@ -174,6 +174,12 @@ merge () merge +## FIXME it would be better to trap this in gitmerge. +## NEWS should never be modified, only eg NEWS.26. +git diff --stat --cached origin/master | grep -q "NEWS " && \ + die "NEWS has been modified" + + [ "$build" ] || exit 0 -- 2.39.5