From 8e638845ff6bb255ad1dea15831089a234535391 Mon Sep 17 00:00:00 2001 From: Peter Geoghegan Date: Tue, 22 Jun 2021 09:06:32 -0700 Subject: Add list of ignorable pgindent commits for git-blame. Add a .git-blame-ignore-revs file with a list of pgindent, pgperlyidy, and reformat-dat-files commit hashes. Postgres hackers that configure git to use the ignore file will get git-blame output that avoids attributing line changes to the ignored indent commits. This makes git-blame output much easier to work with in practice. Author: Peter Geoghegan Reviewed-By: Tom Lane Discussion: https://postgr.es/m/CAH2-Wz=cVh3GHTP6SdLU-Gnmt2zRdF8vZkcrFdSzXQ=WhbWm9Q@mail.gmail.com --- src/tools/RELEASE_CHANGES | 4 ++++ src/tools/pgindent/README | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'src/tools') diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES index ec45ae4c908..5cf2a4dda3c 100644 --- a/src/tools/RELEASE_CHANGES +++ b/src/tools/RELEASE_CHANGES @@ -72,6 +72,10 @@ but there may be reasons to do them at other times as well. 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. + * Renumber any manually-assigned OIDs between 8000 and 9999 to lower numbers, using renumber_oids.pl (see notes in bki.sgml) diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README index d36f5088279..74412d29f8a 100644 --- a/src/tools/pgindent/README +++ b/src/tools/pgindent/README @@ -80,6 +80,11 @@ VALIDATION: When you're done, "git commit" everything including the typedefs.list file 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). + +Another "git commit" will be required for your ignore file changes. --------------------------------------------------------------------------- -- cgit v1.2.3