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

; * admin/automerge: Tweak previous NEWS fix

Browse source
This commit is contained in:
Glenn Morris 2018-10-25 22:08:12 -07:00
parent 3575dd8e8c
commit d404bb5bee
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/automerge
View file

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