From d404bb5beeec6ccfef583dbb9c43e3d043df31cf Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 25 Oct 2018 22:08:12 -0700 Subject: [PATCH] ; * admin/automerge: Tweak previous NEWS fix --- admin/automerge | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/automerge b/admin/automerge index b320369d174..8bf981744b7 100755 --- a/admin/automerge +++ b/admin/automerge @@ -176,8 +176,8 @@ 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" +git diff --stat --cached origin/master | grep -q "etc/NEWS " && \ + die "etc/NEWS has been modified" [ "$build" ] || exit 0 -- 2.39.5