Improve pgindent release workflow.

Update RELEASE_CHANGES to direct the reader towards completing the steps
outlined in the pgindent README, both as a pre-beta task and as a task
to be performed when starting a new development cycle.

This makes it less likely that somebody will miss updating the
.git-blame-ignore-revs file when running pgindent against the tree as a
routine release change task.

Author: Peter Geoghegan <[email protected]>
Reviewed-By: Tom Lane <[email protected]>
Discussion: https://postgr.es/m/CAH2-Wz=2PjF4As8dWECArsXxLKganYmQ-s0UeGqHHbHhqDKqeA@mail.gmail.com

diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES
index 5cf2a4dda3c4bc7f8c0fefd52cb39645d28497f5..fd9dae7e55d7bbc26acc3b91996a1b06742a89b1 100644 (file)
--- a/src/tools/RELEASE_CHANGES
+++ b/src/tools/RELEASE_CHANGES
@@ -70,11 +70,7 @@ but there may be reasons to do them at other times as well.
 
 * Run mechanical code beautification tools:
   pgindent, pgperltidy, and "make reformat-dat-files"
-  (see src/tools/pgindent/README)
-
-* Update .git-blame-ignore-revs. It should contain all of the newly
-  created code beautification commits.  Make sure that you use
-  full-length commit hashes for this.
+  (complete steps from src/tools/pgindent/README)
 
 * Renumber any manually-assigned OIDs between 8000 and 9999
   to lower numbers, using renumber_oids.pl (see notes in bki.sgml)
@@ -90,7 +86,7 @@ Starting a New Development Cycle
 ================================
 
 * Typically, we do pgindent and perltidy runs just before branching,
-  as well as before beta
+  as well as before beta (complete steps from src/tools/pgindent/README)
 
 * Create a branch in git for maintenance of the previous release
    o on master branch, do:

diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index 74412d29f8abff2e0f0bf1874ad0dbef101af2b1..103970c1042d3c4f3e9d45ca3b186fabfdf107ec 100644 (file)
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -82,7 +82,8 @@ you used.
 
 4) Add the newly created commits to the .git-blame-ignore-revs file so
    that "git blame" ignores the commits (for anybody that has opted-in
-   to using the ignore file).
+   to using the ignore file).  Follow the instructions that appear at
+   the top of the .git-blame-ignore-revs file.
 
 Another "git commit" will be required for your ignore file changes.