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

Make it easy to override preferred-branch test

Browse source 
* Makefile.in (preferred-branch-is-current):
Rename from emacs-25-branch-is-current.  All uses changed.
(PREFERRED_BRANCH): New macro.
This commit is contained in:
Paul Eggert 2016-01-30 15:18:00 -08:00
parent ffbf163ab5
commit 370a260218
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile.in
View file

@ -1092,7 +1092,7 @@ bootstrap: bootstrap-clean
$(MAKE) all
.PHONY: ChangeLog change-history change-history-commit change-history-nocommit
.PHONY: emacs-25-branch-is-current unchanged-history-files
.PHONY: preferred-branch-is-current unchanged-history-files
CHANGELOG = ChangeLog
emacslog = build-aux/gitlog-to-emacslog
@ -1109,8 +1109,9 @@ ChangeLog:
./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX)
# Check that we are in a good state for changing history.
emacs-25-branch-is-current:
git branch | grep -q '^\* emacs-25$$'
PREFERRED_BRANCH = master
preferred-branch-is-current:
git branch | grep -q '^\* $(PREFERRED_BRANCH)$$'
unchanged-history-files:
x=$$(git diff-files --name-only $(CHANGELOG_N) $(emacslog)) && \
test -z "$$x"
@ -1120,7 +1121,7 @@ new_commit_regexp = ^commit [0123456789abcdef]* (inclusive)
# Copy newer commit messages to the start of the ChangeLog history file,
# and consider them to be older.
change-history-nocommit: emacs-25-branch-is-current unchanged-history-files
change-history-nocommit: preferred-branch-is-current unchanged-history-files
-rm -f ChangeLog.tmp
$(MAKE) ChangeLog CHANGELOG=ChangeLog.tmp
sed '/^This file records repository revisions/,$$d' \