From 96b99c1bef79f3839e1a2f3c8e8d6f5625dc5cc3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 6 May 2015 17:02:06 -0400 Subject: [PATCH] * Makefile.in (change-history-nocommit): New. --- Makefile.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 858a34d9423..dc7e8258498 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1088,7 +1088,7 @@ bootstrap: bootstrap-clean $(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile $(MAKE) all -.PHONY: ChangeLog change-history change-history-commit +.PHONY: ChangeLog change-history change-history-commit change-history-nocommit .PHONY: master-branch-is-current no-ChangeLog unchanged-history-files # The newest revision that should not appear in the generated ChangeLog. @@ -1116,8 +1116,8 @@ unchanged-history-files: # Copy newer commit messages to the start of the ChangeLog history file, # and consider them to be older. -change-history: no-ChangeLog master-branch-is-current unchanged-history-files \ - ChangeLog +change-history-nocommit: no-ChangeLog master-branch-is-current \ + unchanged-history-files ChangeLog (sed '/^;; [L]ocal Variables:/,$$d' $(CHANGELOG_N).tmp new_origin=$$(git log --pretty=format:%H HEAD^!) && \ @@ -1125,6 +1125,8 @@ change-history: no-ChangeLog master-branch-is-current unchanged-history-files \ Makefile.in.tmp mv $(CHANGELOG_N).tmp $(CHANGELOG_N) mv Makefile.in.tmp Makefile.in + +change-history: change-history-nocommit $(MAKE) $@-commit # If 'make change-history' fails because the newest ChangeLog history -- 2.39.5