[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3575dd8: * admin/automerge: Abort if NEWS gets modi
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] master 3575dd8: * admin/automerge: Abort if NEWS gets modified. |
|
Date: |
Fri, 26 Oct 2018 00:58:15 -0400 (EDT) |
branch: master
commit 3575dd8e8c7edaa904220e5f59240b91814b5564
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* admin/automerge: Abort if NEWS gets modified.
---
admin/automerge | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/admin/automerge b/admin/automerge
index e88711f..b320369 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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 3575dd8: * admin/automerge: Abort if NEWS gets modified.,
Glenn Morris <=