diff options
Diffstat (limited to 'admin/automerge')
| -rwxr-xr-x | admin/automerge | 6 |
1 files changed, 6 insertions, 0 deletions
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 |