diff options
| author | Nicolas Petton <nicolas@petton.fr> | 2016-01-30 10:35:55 +0100 |
|---|---|---|
| committer | Nicolas Petton <nicolas@petton.fr> | 2016-01-30 15:20:11 +0100 |
| commit | a4ab2a563a062e76b9e79befd3a80fdbea523f16 (patch) | |
| tree | 33d549312d680f0e3c915c99a5f003ceb791abd9 | |
| parent | 40a85fba441aa69d47ef9efd645df3411e43ae21 (diff) | |
| download | emacs-a4ab2a563a062e76b9e79befd3a80fdbea523f16.tar.gz | |
Make it possible to run make change-history on emacs-25
* Makefile.in: Check if the current branch is emacs-25 instead of
master.
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index b792e7c5c86..75fd15001a4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1089,7 +1089,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 @@ -1106,8 +1106,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" @@ -1117,7 +1117,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' \ |