procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/automerge: Abort if NEWS gets modified.

Browse source
This commit is contained in:
Glenn Morris 2018-10-25 21:57:53 -07:00
parent 9dd95bf0b1
commit 3575dd8e8c
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
admin/automerge
View file

@ -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