diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 13:56:23 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 13:56:23 -0800 |
| commit | 99fa8c3dbf333f1e3fa7d6449d4b4428ce439ce1 (patch) | |
| tree | fc459c16ca5f7204aa5a21529f8a189bfb45f831 /Makefile.in | |
| parent | 3005605776955593e0b416de9e1ebf158114343e (diff) | |
| parent | 875577bcc8d6139d61f91118d0907b847912b3e1 (diff) | |
| download | emacs-99fa8c3dbf333f1e3fa7d6449d4b4428ce439ce1.tar.gz | |
-
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 55c75717115..7b8328c2195 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1092,7 +1092,7 @@ bootstrap: bootstrap-clean $(MAKE) all .PHONY: ChangeLog change-history change-history-commit change-history-nocommit -.PHONY: master-branch-is-current unchanged-history-files +.PHONY: emacs-25-branch-is-current unchanged-history-files CHANGELOG = ChangeLog emacslog = build-aux/gitlog-to-emacslog @@ -1109,8 +1109,8 @@ ChangeLog: ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX) # Check that we are in a good state for changing history. -master-branch-is-current: - git branch | grep -q '^\* master$$' +emacs-25-branch-is-current: + git branch | grep -q '^\* emacs-25$$' unchanged-history-files: x=$$(git diff-files --name-only $(CHANGELOG_N) $(emacslog)) && \ test -z "$$x" @@ -1120,7 +1120,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: master-branch-is-current unchanged-history-files +change-history-nocommit: emacs-25-branch-is-current unchanged-history-files -rm -f ChangeLog.tmp $(MAKE) ChangeLog CHANGELOG=ChangeLog.tmp sed '/^This file records repository revisions/,$$d' \ |